From: Jingoo Han Date: Fri, 22 Feb 2013 00:45:41 +0000 (-0800) Subject: rtc: rtc-wm831x: use devm_request_threaded_irq() X-Git-Tag: upstream/snapshot3+hdmi~5683^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd5231ce336e038037b4f0190a6838bdd6e17c6d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git rtc: rtc-wm831x: use devm_request_threaded_irq() Use devm_request_threaded_irq() to make cleanup paths more simple. Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index 1b0affb..2f0ac7b 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -443,9 +443,10 @@ static int wm831x_rtc_probe(struct platform_device *pdev) goto err; } - ret = request_threaded_irq(alm_irq, NULL, wm831x_alm_irq, - IRQF_TRIGGER_RISING, "RTC alarm", - wm831x_rtc); + ret = devm_request_threaded_irq(&pdev->dev, alm_irq, NULL, + wm831x_alm_irq, + IRQF_TRIGGER_RISING, "RTC alarm", + wm831x_rtc); if (ret != 0) { dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n", alm_irq, ret); @@ -462,9 +463,7 @@ err: static int wm831x_rtc_remove(struct platform_device *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); return 0;