diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:18:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:25 -0400 |
commit | 8c32edb57fc68497c719971cc25944af424aaf3a (patch) | |
tree | c05ad00a236ea7bfb83347698fb7483005b88933 /drivers/rtc/rtc-da9055.c | |
parent | 3689cd741f627ee49a1a4d5c9aec49e120b6c291 (diff) |
rtc: rtc-da9055: 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>
Diffstat (limited to 'drivers/rtc/rtc-da9055.c')
-rw-r--r-- | drivers/rtc/rtc-da9055.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-da9055.c b/drivers/rtc/rtc-da9055.c index 8f0dcfedb83c..73858ca9709a 100644 --- a/drivers/rtc/rtc-da9055.c +++ b/drivers/rtc/rtc-da9055.c | |||
@@ -294,7 +294,7 @@ static int da9055_rtc_probe(struct platform_device *pdev) | |||
294 | 294 | ||
295 | device_init_wakeup(&pdev->dev, 1); | 295 | device_init_wakeup(&pdev->dev, 1); |
296 | 296 | ||
297 | rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, | 297 | rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, |
298 | &da9055_rtc_ops, THIS_MODULE); | 298 | &da9055_rtc_ops, THIS_MODULE); |
299 | if (IS_ERR(rtc->rtc)) { | 299 | if (IS_ERR(rtc->rtc)) { |
300 | ret = PTR_ERR(rtc->rtc); | 300 | ret = PTR_ERR(rtc->rtc); |
@@ -317,9 +317,6 @@ err_rtc: | |||
317 | 317 | ||
318 | static int da9055_rtc_remove(struct platform_device *pdev) | 318 | static int da9055_rtc_remove(struct platform_device *pdev) |
319 | { | 319 | { |
320 | struct da9055_rtc *rtc = pdev->dev.platform_data; | ||
321 | |||
322 | rtc_device_unregister(rtc->rtc); | ||
323 | platform_set_drvdata(pdev, NULL); | 320 | platform_set_drvdata(pdev, NULL); |
324 | 321 | ||
325 | return 0; | 322 | return 0; |