summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 16:19:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:29 -0700
commit0ea9a0e7877489bdd50c3556eaf89aab79190072 (patch)
treea4ae8cf063823a1303aaf233dbffdbfd4c5b690c
parent9f421f8db048a9d4a4550c407a26d9b871aac529 (diff)
downloadblackbird-op-linux-0ea9a0e7877489bdd50c3556eaf89aab79190072.tar.gz
blackbird-op-linux-0ea9a0e7877489bdd50c3556eaf89aab79190072.zip
rtc: rtc-ds1302: 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-ds1302.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index 7d4c2b44d603..d13954346286 100644
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -224,7 +224,7 @@ static int __init ds1302_rtc_probe(struct platform_device *pdev)
return -ENODEV;
}
- rtc = rtc_device_register("ds1302", &pdev->dev,
+ rtc = devm_rtc_device_register(&pdev->dev, "ds1302",
&ds1302_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc))
return PTR_ERR(rtc);
@@ -236,9 +236,6 @@ static int __init ds1302_rtc_probe(struct platform_device *pdev)
static int __exit ds1302_rtc_remove(struct platform_device *pdev)
{
- struct rtc_device *rtc = platform_get_drvdata(pdev);
-
- rtc_device_unregister(rtc);
platform_set_drvdata(pdev, NULL);
return 0;
OpenPOWER on IntegriCloud