Merge tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-r9701.c

diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index 7726f4a4f2d051882f74a8a074834988cbad0a4c..feeedbd82000322b62278724a07f44361591746a 100644 (file)
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -154,21 +154,18 @@ static int r9701_probe(struct spi_device *spi)
                }
        }
 
-       rtc = rtc_device_register("r9701",
-                               &spi->dev, &r9701_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_device_register(&spi->dev, "r9701",
+                               &r9701_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
 
-       dev_set_drvdata(&spi->dev, rtc);
+       spi_set_drvdata(spi, rtc);
 
        return 0;
 }
 
 static int r9701_remove(struct spi_device *spi)
 {
-       struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
-
-       rtc_device_unregister(rtc);
        return 0;
 }