summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 16:19:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:30 -0700
commit04353a730375af0cb2c5b3fd42046699d5918f44 (patch)
tree621bf91ff13855b5feb04467b558175501af4d0e
parentfeb141d11a7afa97ce52a7bf2078b8d243bac227 (diff)
downloadlinux-stable-04353a730375af0cb2c5b3fd42046699d5918f44.tar.gz
linux-stable-04353a730375af0cb2c5b3fd42046699d5918f44.tar.bz2
linux-stable-04353a730375af0cb2c5b3fd42046699d5918f44.zip
rtc: rtc-max6902: use devm_rtc_device_register()
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>
-rw-r--r--drivers/rtc/rtc-max6902.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 7d0bf698b79e..7e4491b1f90b 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -134,8 +134,8 @@ static int max6902_probe(struct spi_device *spi)
if (res != 0)
return res;
- rtc = rtc_device_register("max6902",
- &spi->dev, &max6902_rtc_ops, THIS_MODULE);
+ rtc = devm_rtc_device_register(&spi->dev, "max6902",
+ &max6902_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc))
return PTR_ERR(rtc);
@@ -145,9 +145,6 @@ static int max6902_probe(struct spi_device *spi)
static int max6902_remove(struct spi_device *spi)
{
- struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
-
- rtc_device_unregister(rtc);
return 0;
}