rtc: ds1305: switch to rtc_register_device
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 12 Oct 2017 22:03:22 +0000 (00:03 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 12 Oct 2017 22:10:05 +0000 (00:10 +0200)
This allows for future improvement of the driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-ds1305.c

index 72b2293..c3232c8 100644 (file)
@@ -708,10 +708,15 @@ static int ds1305_probe(struct spi_device *spi)
                dev_dbg(&spi->dev, "AM/PM\n");
 
        /* register RTC ... from here on, ds1305->ctrl needs locking */
-       ds1305->rtc = devm_rtc_device_register(&spi->dev, "ds1305",
-                       &ds1305_ops, THIS_MODULE);
+       ds1305->rtc = devm_rtc_allocate_device(&spi->dev);
        if (IS_ERR(ds1305->rtc)) {
-               status = PTR_ERR(ds1305->rtc);
+               return PTR_ERR(ds1305->rtc);
+       }
+
+       ds1305->rtc->ops = &ds1305_ops;
+
+       status = rtc_register_device(ds1305->rtc);
+       if (status) {
                dev_dbg(&spi->dev, "register rtc --> %d\n", status);
                return status;
        }