From: Bartosz Golaszewski <[email protected]>

devm_rtc_device_register() is deprecated. Use devm_rtc_allocate_device()
and devm_rtc_register_device() pair instead.

Signed-off-by: Bartosz Golaszewski <[email protected]>
---
 drivers/rtc/rtc-max8925.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 64bb8ac6ef62..902403d2fb59 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -272,15 +272,13 @@ static int max8925_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8925-rtc",
-                                       &max8925_rtc_ops, THIS_MODULE);
-       ret = PTR_ERR(info->rtc_dev);
-       if (IS_ERR(info->rtc_dev)) {
-               dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-               return ret;
-       }
+       info->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
+       if (IS_ERR(info->rtc_dev))
+               return PTR_ERR(info->rtc_dev);
 
-       return 0;
+       info->rtc_dev->ops = &max8925_rtc_ops;
+
+       return devm_rtc_register_device(info->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP
-- 
2.29.1

Reply via email to