openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtc: rtc-wm831x: use devm_request_threaded_irq() 

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:41 -08:00 committed by Linus Torvalds
parent 6d77bdca22
commit fd5231ce33
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/rtc/rtc-wm831x.c
View File

@ -443,9 +443,10 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
goto err; goto err;
} }
ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq, ret = devm_request_threaded_irq(&pdev->dev, alm_irq, NULL,
IRQF_TRIGGER_RISING, "RTC alarm", wm831x_alm_irq,
wm831x_rtc); IRQF_TRIGGER_RISING, "RTC alarm",
wm831x_rtc);
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",
alm_irq, ret); alm_irq, ret);
@ -462,9 +463,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
static int wm831x_rtc_remove(struct platform_device *pdev) static int wm831x_rtc_remove(struct platform_device *pdev)
{ {
struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev); struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);
int alm_irq = platform_get_irq_byname(pdev, "ALM");
free_irq(alm_irq, wm831x_rtc);
rtc_device_unregister(wm831x_rtc->rtc); rtc_device_unregister(wm831x_rtc->rtc);
return 0; return 0;