android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: rtc-max77686: use devm_rtc_device_register()

Browse Source 
devm_rtc_device_register() is device managed and makes cleanup
paths simpler. Also, this patch uses devm_request_threaded_irq().

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:19:05 -07:00 committed by Linus Torvalds
parent bbd05b2db6
commit f56950ec3a
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/rtc/rtc-max77686.c
View File

@ -538,8 +538,8 @@ static int max77686_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
info->rtc_dev = rtc_device_register("max77686-rtc", &pdev->dev, info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max77686-rtc",
&max77686_rtc_ops, THIS_MODULE); &max77686_rtc_ops, THIS_MODULE);
if (IS_ERR(info->rtc_dev)) { if (IS_ERR(info->rtc_dev)) {
dev_info(&pdev->dev, "%s: fail\n", __func__); dev_info(&pdev->dev, "%s: fail\n", __func__);
@ -555,8 +555,8 @@ static int max77686_rtc_probe(struct platform_device *pdev)
goto err_rtc; goto err_rtc;
info->virq = virq; info->virq = virq;
ret = request_threaded_irq(virq, NULL, max77686_rtc_alarm_irq, 0, ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
"rtc-alarm0", info); max77686_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",
info->virq, ret); info->virq, ret);
@ -569,13 +569,6 @@ static int max77686_rtc_probe(struct platform_device *pdev)
static int max77686_rtc_remove(struct platform_device *pdev) static int max77686_rtc_remove(struct platform_device *pdev)
{ {
struct max77686_rtc_info *info = platform_get_drvdata(pdev);
if (info) {
free_irq(info->virq, info);
rtc_device_unregister(info->rtc_dev);
}
return 0; return 0;
} }