rtc: rtc-m41t94: use devm_rtc_device_register()

devm_rtc_device_register() is device managed and makes cleanup paths
simpler.

Signed-off-by: Jingoo Han <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c
index 89266c6764bc0915bdf0d1b78cfa065fa699f20f..cf655a91e38575780055ee3cbc035b28ca68d970 100644 (file)
--- a/drivers/rtc/rtc-m41t94.c
+++ b/drivers/rtc/rtc-m41t94.c
@@ -124,8 +124,8 @@ static int m41t94_probe(struct spi_device *spi)
                return res;
        }
 
-       rtc = rtc_device_register(m41t94_driver.driver.name,
-               &spi->dev, &m41t94_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_device_register(&spi->dev, m41t94_driver.driver.name,
+                                       &m41t94_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
 
@@ -136,11 +136,6 @@ static int m41t94_probe(struct spi_device *spi)
 
 static int m41t94_remove(struct spi_device *spi)
 {
-       struct rtc_device *rtc = spi_get_drvdata(spi);
-
-       if (rtc)
-               rtc_device_unregister(rtc);
-
        return 0;
 }