Commit bc2e9c0b authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

rtc: rtc-vt8500: use devm_rtc_device_register()

devm_rtc_device_register() is device managed and makes cleanup
paths simpler.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e38fc305
...@@ -252,7 +252,7 @@ static int vt8500_rtc_probe(struct platform_device *pdev) ...@@ -252,7 +252,7 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
writel(VT8500_RTC_CR_ENABLE, writel(VT8500_RTC_CR_ENABLE,
vt8500_rtc->regbase + VT8500_RTC_CR); vt8500_rtc->regbase + VT8500_RTC_CR);
vt8500_rtc->rtc = rtc_device_register("vt8500-rtc", &pdev->dev, vt8500_rtc->rtc = devm_rtc_device_register(&pdev->dev, "vt8500-rtc",
&vt8500_rtc_ops, THIS_MODULE); &vt8500_rtc_ops, THIS_MODULE);
if (IS_ERR(vt8500_rtc->rtc)) { if (IS_ERR(vt8500_rtc->rtc)) {
ret = PTR_ERR(vt8500_rtc->rtc); ret = PTR_ERR(vt8500_rtc->rtc);
...@@ -266,13 +266,11 @@ static int vt8500_rtc_probe(struct platform_device *pdev) ...@@ -266,13 +266,11 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "can't get irq %i, err %d\n", dev_err(&pdev->dev, "can't get irq %i, err %d\n",
vt8500_rtc->irq_alarm, ret); vt8500_rtc->irq_alarm, ret);
goto err_unreg; goto err_return;
} }
return 0; return 0;
err_unreg:
rtc_device_unregister(vt8500_rtc->rtc);
err_return: err_return:
return ret; return ret;
} }
...@@ -281,8 +279,6 @@ static int vt8500_rtc_remove(struct platform_device *pdev) ...@@ -281,8 +279,6 @@ static int vt8500_rtc_remove(struct platform_device *pdev)
{ {
struct vt8500_rtc *vt8500_rtc = platform_get_drvdata(pdev); struct vt8500_rtc *vt8500_rtc = platform_get_drvdata(pdev);
rtc_device_unregister(vt8500_rtc->rtc);
/* Disable alarm matching */ /* Disable alarm matching */
writel(0, vt8500_rtc->regbase + VT8500_RTC_IS); writel(0, vt8500_rtc->regbase + VT8500_RTC_IS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment