]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-ds3234: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:19:35 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:29 +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-ds3234.c

index 7a4495ef1c39846eb2615cb6cb48d0377c3becc0..a66efd49430e87e4a8629c9a9cd9e7518b18231e 100644 (file)
@@ -146,8 +146,8 @@ static int ds3234_probe(struct spi_device *spi)
        ds3234_get_reg(&spi->dev, DS3234_REG_CONT_STAT, &tmp);
        dev_info(&spi->dev, "Ctrl/Stat Reg: 0x%02x\n", tmp);
 
-       rtc = rtc_device_register("ds3234",
-                               &spi->dev, &ds3234_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_device_register(&spi->dev, "ds3234",
+                               &ds3234_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
 
@@ -158,9 +158,6 @@ static int ds3234_probe(struct spi_device *spi)
 
 static int ds3234_remove(struct spi_device *spi)
 {
-       struct rtc_device *rtc = spi_get_drvdata(spi);
-
-       rtc_device_unregister(rtc);
        return 0;
 }