rtc: s3c: Remove usage of devm_rtc_device_register()
authorSam Protsenko <semen.protsenko@linaro.org>
Thu, 21 Oct 2021 20:22:54 +0000 (23:22 +0300)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Sat, 23 Oct 2021 21:57:23 +0000 (23:57 +0200)
devm_rtc_device_register() is deprecated. Use devm_rtc_allocate_device()
and devm_rtc_register_device() API instead. This change doesn't change
the behavior, but allows for further improvements.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20211021202256.28517-2-semen.protsenko@linaro.org
drivers/rtc/rtc-s3c.c

index e57d3ca70a7828864a53615327908e7e66e8d568..10e5917942763d90172b2036579c6ab195a08077 100644 (file)
@@ -447,15 +447,18 @@ static int s3c_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       /* register RTC and exit */
-       info->rtc = devm_rtc_device_register(&pdev->dev, "s3c", &s3c_rtcops,
-                                            THIS_MODULE);
+       info->rtc = devm_rtc_allocate_device(&pdev->dev);
        if (IS_ERR(info->rtc)) {
-               dev_err(&pdev->dev, "cannot attach rtc\n");
                ret = PTR_ERR(info->rtc);
                goto err_nortc;
        }
 
+       info->rtc->ops = &s3c_rtcops;
+
+       ret = devm_rtc_register_device(info->rtc);
+       if (ret)
+               goto err_nortc;
+
        ret = devm_request_irq(&pdev->dev, info->irq_alarm, s3c_rtc_alarmirq,
                               0, "s3c2410-rtc alarm", info);
        if (ret) {