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

rtc: rtc-da9052: use devm_request_threaded_irq()

Browse Source 
Use devm_request_threaded_irq() 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:42 -08:00
committed by Linus Torvalds
parent fd5231ce33
commit 27239a1498
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/rtc/rtc-da9052.c
View File

@@ -240,7 +240,8 @@ static int da9052_rtc_probe(struct platform_device *pdev)
rtc->da9052 = dev_get_drvdata(pdev->dev.parent); rtc->da9052 = dev_get_drvdata(pdev->dev.parent);
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->irq = platform_get_irq_byname(pdev, "ALM"); rtc->irq = platform_get_irq_byname(pdev, "ALM");
ret = request_threaded_irq(rtc->irq, NULL, da9052_rtc_irq, ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
da9052_rtc_irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"ALM", rtc); "ALM", rtc);
if (ret != 0) { if (ret != 0) {
@@ -250,16 +251,10 @@ static int da9052_rtc_probe(struct platform_device *pdev)
rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
&da9052_rtc_ops, THIS_MODULE); &da9052_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc)) { if (IS_ERR(rtc->rtc))
ret = PTR_ERR(rtc->rtc); return PTR_ERR(rtc->rtc);
goto err_free_irq;
}
return 0; return 0;
err_free_irq:
free_irq(rtc->irq, rtc);
return ret;
} }
static int da9052_rtc_remove(struct platform_device *pdev) static int da9052_rtc_remove(struct platform_device *pdev)
@@ -267,7 +262,6 @@ static int da9052_rtc_remove(struct platform_device *pdev)
struct da9052_rtc *rtc = pdev->dev.platform_data; struct da9052_rtc *rtc = pdev->dev.platform_data;
rtc_device_unregister(rtc->rtc); rtc_device_unregister(rtc->rtc);
free_irq(rtc->irq, rtc);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
return 0; return 0;