From 14b149ebd252029b41ed432024ee1db1b6afb028 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Thu, 21 Feb 2013 16:45:39 -0800 Subject: [PATCH] rtc: rtc-lp8788: 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 --- drivers/rtc/rtc-lp8788.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/rtc/rtc-lp8788.c b/drivers/rtc/rtc-lp8788.c index 4a4e78e2231c..9a4631218f41 100644 --- a/drivers/rtc/rtc-lp8788.c +++ b/drivers/rtc/rtc-lp8788.c @@ -278,16 +278,11 @@ static int lp8788_alarm_irq_register(struct platform_device *pdev, rtc->irq = irq_create_mapping(irqdm, irq); - return request_threaded_irq(rtc->irq, NULL, lp8788_alarm_irq_handler, + return devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL, + lp8788_alarm_irq_handler, 0, LP8788_ALM_IRQ, rtc); } -static void lp8788_alarm_irq_unregister(struct lp8788_rtc *rtc) -{ - if (rtc->irq) - free_irq(rtc->irq, rtc); -} - static int lp8788_rtc_probe(struct platform_device *pdev) { struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent); @@ -321,7 +316,6 @@ static int lp8788_rtc_remove(struct platform_device *pdev) { struct lp8788_rtc *rtc = platform_get_drvdata(pdev); - lp8788_alarm_irq_unregister(rtc); rtc_device_unregister(rtc->rdev); platform_set_drvdata(pdev, NULL); -- 2.39.5