summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 16:19:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:31 -0700
commit9b6d955aedf84ab5e97cda73c6df9ea17952a3d4 (patch)
tree3af51d8a006281cf5c511094b22008758e6f3872
parent9dc37c3353a4984792f11f8d2940d9d537f2b64c (diff)
downloadop-kernel-dev-9b6d955aedf84ab5e97cda73c6df9ea17952a3d4.zip
op-kernel-dev-9b6d955aedf84ab5e97cda73c6df9ea17952a3d4.tar.gz
rtc: rtc-r9701: 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-r9701.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index 7726f4a..0adf5b5 100644
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -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;
}
OpenPOWER on IntegriCloud