AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rtc: rtc-vt8500: use devm_*() functions

Browse Source 
Use devm_*() functions to make cleanup paths more simple.

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>
This commit is contained in:
Jingoo Han 2013-02-21 16:45:37 -08:00 committed by Linus Torvalds
parent 190ab4af14
commit 0db29c1da7
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/rtc/rtc-vt8500.c
View File

@ -231,20 +231,21 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
vt8500_rtc->res = request_mem_region(vt8500_rtc->res->start, vt8500_rtc->res = devm_request_mem_region(&pdev->dev,
resource_size(vt8500_rtc->res), vt8500_rtc->res->start,
"vt8500-rtc"); resource_size(vt8500_rtc->res),
"vt8500-rtc");
if (vt8500_rtc->res == NULL) { if (vt8500_rtc->res == NULL) {
dev_err(&pdev->dev, "failed to request I/O memory\n"); dev_err(&pdev->dev, "failed to request I/O memory\n");
return -EBUSY; return -EBUSY;
} }
vt8500_rtc->regbase = ioremap(vt8500_rtc->res->start, vt8500_rtc->regbase = devm_ioremap(&pdev->dev, vt8500_rtc->res->start,
resource_size(vt8500_rtc->res)); resource_size(vt8500_rtc->res));
if (!vt8500_rtc->regbase) { if (!vt8500_rtc->regbase) {
dev_err(&pdev->dev, "Unable to map RTC I/O memory\n"); dev_err(&pdev->dev, "Unable to map RTC I/O memory\n");
ret = -EBUSY; ret = -EBUSY;
goto err_release; goto err_return;
} }
/* Enable RTC and set it to 24-hour mode */ /* Enable RTC and set it to 24-hour mode */
@ -257,11 +258,11 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
ret = PTR_ERR(vt8500_rtc->rtc); ret = PTR_ERR(vt8500_rtc->rtc);
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Failed to register RTC device -> %d\n", ret); "Failed to register RTC device -> %d\n", ret);
goto err_unmap; goto err_return;
} }
ret = request_irq(vt8500_rtc->irq_alarm, vt8500_rtc_irq, 0, ret = devm_request_irq(&pdev->dev, vt8500_rtc->irq_alarm,
"rtc alarm", vt8500_rtc); vt8500_rtc_irq, 0, "rtc alarm", vt8500_rtc);
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);
@ -272,11 +273,7 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
err_unreg: err_unreg:
rtc_device_unregister(vt8500_rtc->rtc); rtc_device_unregister(vt8500_rtc->rtc);
err_unmap: err_return:
iounmap(vt8500_rtc->regbase);
err_release:
release_mem_region(vt8500_rtc->res->start,
resource_size(vt8500_rtc->res));
return ret; return ret;
} }
@ -284,15 +281,10 @@ 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);
free_irq(vt8500_rtc->irq_alarm, vt8500_rtc);
rtc_device_unregister(vt8500_rtc->rtc); 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);
iounmap(vt8500_rtc->regbase);
release_mem_region(vt8500_rtc->res->start,
resource_size(vt8500_rtc->res));
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);