korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-12 05:48:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

drivers/rtc/rtc-max8925.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:33 -07:00 committed by Linus Torvalds
parent 4f58cd9b46
commit e035be6a55
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/rtc/rtc-max8925.c
View File

@ -253,7 +253,8 @@ static int max8925_rtc_probe(struct platform_device *pdev)
struct max8925_rtc_info *info; struct max8925_rtc_info *info;
int ret; int ret;
info = kzalloc(sizeof(struct max8925_rtc_info), GFP_KERNEL); info = devm_kzalloc(&pdev->dev, sizeof(struct max8925_rtc_info),
GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
info->chip = chip; info->chip = chip;
@ -261,12 +262,13 @@ static int max8925_rtc_probe(struct platform_device *pdev)
info->dev = &pdev->dev; info->dev = &pdev->dev;
info->irq = platform_get_irq(pdev, 0); info->irq = platform_get_irq(pdev, 0);
ret = request_threaded_irq(info->irq, NULL, rtc_update_handler, ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
IRQF_ONESHOT, "rtc-alarm0", info); rtc_update_handler, IRQF_ONESHOT,
"rtc-alarm0", 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_irq; goto err;
} }
dev_set_drvdata(&pdev->dev, info); dev_set_drvdata(&pdev->dev, info);
@ -275,32 +277,22 @@ static int max8925_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
info->rtc_dev = rtc_device_register("max8925-rtc", &pdev->dev, info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8925-rtc",
&max8925_rtc_ops, THIS_MODULE); &max8925_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; goto err;
} }
return 0; return 0;
out_rtc: err:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
free_irq(info->irq, info);
out_irq:
kfree(info);
return ret; return ret;
} }
static int max8925_rtc_remove(struct platform_device *pdev) static int max8925_rtc_remove(struct platform_device *pdev)
{ {
struct max8925_rtc_info *info = platform_get_drvdata(pdev);
if (info) {
free_irq(info->irq, info);
rtc_device_unregister(info->rtc_dev);
kfree(info);
}
return 0; return 0;
} }