rtc: pm8xxx: convert to devm_rtc_allocate_device
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 6 Mar 2020 07:37:55 +0000 (08:37 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 16 Mar 2020 10:12:10 +0000 (11:12 +0100)
This allows further improvement of the driver. Also remove the unnecessary
error string as the core will already display error messages.

Link: https://lore.kernel.org/r/20200306073758.58050-1-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-pm8xxx.c

index 07ea1be3abb9d76feed1f85e27fd74abf75602c7..b97333c95e53a930fb836447846447f13e35f404 100644 (file)
@@ -486,13 +486,11 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 1);
 
        /* Register the RTC device */
-       rtc_dd->rtc = devm_rtc_device_register(&pdev->dev, "pm8xxx_rtc",
-                                              &pm8xxx_rtc_ops, THIS_MODULE);
-       if (IS_ERR(rtc_dd->rtc)) {
-               dev_err(&pdev->dev, "%s: RTC registration failed (%ld)\n",
-                       __func__, PTR_ERR(rtc_dd->rtc));
+       rtc_dd->rtc = devm_rtc_allocate_device(&pdev->dev);
+       if (IS_ERR(rtc_dd->rtc))
                return PTR_ERR(rtc_dd->rtc);
-       }
+
+       rtc_dd->rtc->ops = &pm8xxx_rtc_ops;
 
        /* Request the alarm IRQ */
        rc = devm_request_any_context_irq(&pdev->dev, rtc_dd->rtc_alarm_irq,
@@ -504,9 +502,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
                return rc;
        }
 
-       dev_dbg(&pdev->dev, "Probe success !!\n");
-
-       return 0;
+       return rtc_register_device(rtc_dd->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP