]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
rtc: rtc-r9701: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:19:45 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:31 +0000 (18:28 -0700)
devm_rtc_device_register() is device managed and makes cleanup paths
simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-r9701.c

index 7726f4a4f2d051882f74a8a074834988cbad0a4c..0adf5b528129911b74a5a0eebf72a63e6f0e7139 100644 (file)
@@ -154,8 +154,8 @@ 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);
 
@@ -166,9 +166,6 @@ static int r9701_probe(struct spi_device *spi)
 
 static int r9701_remove(struct spi_device *spi)
 {
-       struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
-
-       rtc_device_unregister(rtc);
        return 0;
 }