rtc: rtc-tps6586x: use devm_request_threaded_irq()
authorJingoo Han <jg1.han@samsung.com>
Fri, 22 Feb 2013 00:45:36 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Feb 2013 01:22:30 +0000 (17:22 -0800)
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>
drivers/rtc/rtc-tps6586x.c

index 70f61b8..aab4e8c 100644 (file)
@@ -282,7 +282,8 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
                goto fail_rtc_register;
        }
 
-       ret = request_threaded_irq(rtc->irq, NULL, tps6586x_rtc_irq,
+       ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
+                               tps6586x_rtc_irq,
                                IRQF_ONESHOT | IRQF_EARLY_RESUME,
                                dev_name(&pdev->dev), rtc);
        if (ret < 0) {
@@ -311,7 +312,6 @@ static int tps6586x_rtc_remove(struct platform_device *pdev)
        tps6586x_update(tps_dev, RTC_CTRL, 0,
                RTC_ENABLE | OSC_SRC_SEL | PRE_BYPASS | CL_SEL_MASK);
        rtc_device_unregister(rtc->rtc);
-       free_irq(rtc->irq, rtc);
        return 0;
 }