Merge tag 'arc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

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

diff --git a/drivers/rtc/rtc-rx4581.c b/drivers/rtc/rtc-rx4581.c
index 599ec73ec8869a3304df40da006325e72179bc26..84eb08d65d3053ee200bfec8d6736d1456518d5b 100644 (file)
--- a/drivers/rtc/rtc-rx4581.c
+++ b/drivers/rtc/rtc-rx4581.c
@@ -273,20 +273,17 @@ static int rx4581_probe(struct spi_device *spi)
        if (res != 0)
                return res;
 
-       rtc = rtc_device_register("rx4581",
-                               &spi->dev, &rx4581_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_device_register(&spi->dev, "rx4581",
+                               &rx4581_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 rx4581_remove(struct spi_device *spi)
 {
-       struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
-
-       rtc_device_unregister(rtc);
        return 0;
 }