rtc: pm8xxx: use devm_request_any_context_irq

Make use of the devm_* variant of request_any_context_irq to allow for
elimination of remove().

Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
index cdc9dc211eb0f990d4fa0048c6750c20d983c832..91ac2e346aeafbdaa8abae64d21dcb9385567642 100644 (file)
--- a/drivers/rtc/rtc-pm8xxx.c
+++ b/drivers/rtc/rtc-pm8xxx.c
@@ -434,9 +434,10 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        }
 
        /* Request the alarm IRQ */
-       rc = request_any_context_irq(rtc_dd->rtc_alarm_irq,
-                                    pm8xxx_alarm_trigger, IRQF_TRIGGER_RISING,
-                                    "pm8xxx_rtc_alarm", rtc_dd);
+       rc = devm_request_any_context_irq(&pdev->dev, rtc_dd->rtc_alarm_irq,
+                                         pm8xxx_alarm_trigger,
+                                         IRQF_TRIGGER_RISING,
+                                         "pm8xxx_rtc_alarm", rtc_dd);
        if (rc < 0) {
                dev_err(&pdev->dev, "Request IRQ failed (%d)\n", rc);
                return rc;
@@ -449,16 +450,6 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int pm8xxx_rtc_remove(struct platform_device *pdev)
-{
-       struct pm8xxx_rtc *rtc_dd = platform_get_drvdata(pdev);
-
-       device_init_wakeup(&pdev->dev, 0);
-       free_irq(rtc_dd->rtc_alarm_irq, rtc_dd);
-
-       return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int pm8xxx_rtc_resume(struct device *dev)
 {
@@ -487,7 +478,6 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops,
 
 static struct platform_driver pm8xxx_rtc_driver = {
        .probe          = pm8xxx_rtc_probe,
-       .remove         = pm8xxx_rtc_remove,
        .driver = {
                .name   = PM8XXX_RTC_DEV_NAME,
                .owner  = THIS_MODULE,