lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Use devm_*() functions to make 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>
This commit is contained in:
Jingoo Han
2013-04-29 16:20:43 -07:00
committed by Linus Torvalds
parent 4ebabb78e4
commit 8925e31a9c
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/rtc/rtc-max8998.c
View File

@@ -256,7 +256,8 @@ static int max8998_rtc_probe(struct platform_device *pdev)
struct max8998_rtc_info *info; struct max8998_rtc_info *info;
int ret; int ret;
info = kzalloc(sizeof(struct max8998_rtc_info), GFP_KERNEL); info = devm_kzalloc(&pdev->dev, sizeof(struct max8998_rtc_info),
GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
@@ -267,7 +268,7 @@ static int max8998_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
info->rtc_dev = rtc_device_register("max8998-rtc", &pdev->dev, info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8998-rtc",
&max8998_rtc_ops, THIS_MODULE); &max8998_rtc_ops, THIS_MODULE);
if (IS_ERR(info->rtc_dev)) { if (IS_ERR(info->rtc_dev)) {
@@ -276,8 +277,8 @@ static int max8998_rtc_probe(struct platform_device *pdev)
goto out_rtc; goto out_rtc;
} }
ret = request_threaded_irq(info->irq, NULL, max8998_rtc_alarm_irq, 0, ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
"rtc-alarm0", info); max8998_rtc_alarm_irq, 0, "rtc-alarm0", info);
if (ret < 0) if (ret < 0)
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
@@ -294,20 +295,11 @@ static int max8998_rtc_probe(struct platform_device *pdev)
out_rtc: out_rtc:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(info);
return ret; return ret;
} }
static int max8998_rtc_remove(struct platform_device *pdev) static int max8998_rtc_remove(struct platform_device *pdev)
{ {
struct max8998_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;
} }