leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/rtc/rtc-88pm860x.c: use devm_* APIs

Browse Source 
devm_* functions are device managed and make cleanup code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: 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:
Sachin Kamat 2013-04-29 16:20:27 -07:00 committed by Linus Torvalds
parent 7f391f54cd
commit 3087b3d090
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/rtc/rtc-88pm860x.c
View File

@ -318,14 +318,14 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
info = kzalloc(sizeof(struct pm860x_rtc_info), GFP_KERNEL); info = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_rtc_info),
GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
info->irq = platform_get_irq(pdev, 0); info->irq = platform_get_irq(pdev, 0);
if (info->irq < 0) { if (info->irq < 0) {
dev_err(&pdev->dev, "No IRQ resource!\n"); dev_err(&pdev->dev, "No IRQ resource!\n");
ret = -EINVAL; return info->irq;
goto out;
} }
info->chip = chip; info->chip = chip;
@ -333,12 +333,13 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
info->dev = &pdev->dev; info->dev = &pdev->dev;
dev_set_drvdata(&pdev->dev, info); dev_set_drvdata(&pdev->dev, info);
ret = request_threaded_irq(info->irq, NULL, rtc_update_handler, ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
IRQF_ONESHOT, "rtc", info); rtc_update_handler, IRQF_ONESHOT, "rtc",
info);
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n", dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
info->irq, ret); info->irq, ret);
goto out; return ret;
} }
/* set addresses of 32-bit base value for RTC time */ /* set addresses of 32-bit base value for RTC time */
@ -350,7 +351,7 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
ret = pm860x_rtc_read_time(&pdev->dev, &tm); ret = pm860x_rtc_read_time(&pdev->dev, &tm);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to read initial time.\n"); dev_err(&pdev->dev, "Failed to read initial time.\n");
goto out_rtc; return ret;
} }
if ((tm.tm_year < 70) || (tm.tm_year > 138)) { if ((tm.tm_year < 70) || (tm.tm_year > 138)) {
tm.tm_year = 70; tm.tm_year = 70;
@ -362,7 +363,7 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
ret = pm860x_rtc_set_time(&pdev->dev, &tm); ret = pm860x_rtc_set_time(&pdev->dev, &tm);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to set initial time.\n"); dev_err(&pdev->dev, "Failed to set initial time.\n");
goto out_rtc; return ret;
} }
} }
rtc_tm_to_time(&tm, &ticks); rtc_tm_to_time(&tm, &ticks);
@ -373,12 +374,12 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
} }
} }
info->rtc_dev = rtc_device_register("88pm860x-rtc", &pdev->dev, info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm860x-rtc",
&pm860x_rtc_ops, THIS_MODULE); &pm860x_rtc_ops, THIS_MODULE);
ret = PTR_ERR(info->rtc_dev); ret = PTR_ERR(info->rtc_dev);
if (IS_ERR(info->rtc_dev)) { if (IS_ERR(info->rtc_dev)) {
dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
goto out_rtc; return ret;
} }
/* /*
@ -405,11 +406,6 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
return 0; return 0;
out_rtc:
free_irq(info->irq, info);
out:
kfree(info);
return ret;
} }
static int pm860x_rtc_remove(struct platform_device *pdev) static int pm860x_rtc_remove(struct platform_device *pdev)
@ -423,9 +419,6 @@ static int pm860x_rtc_remove(struct platform_device *pdev)
#endif /* VRTC_CALIBRATION */ #endif /* VRTC_CALIBRATION */
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
rtc_device_unregister(info->rtc_dev);
free_irq(info->irq, info);
kfree(info);
return 0; return 0;
} }