Merge tag 'fixes-rcu-fiq-signed' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mfd / rc5t583-irq.c

diff --git a/drivers/mfd/rc5t583-irq.c b/drivers/mfd/rc5t583-irq.c
index 3f8812daa3045e89e67df777a17b38817800315b..f8dde59ea6af4d0aecb16cd0d6269df549693e57 100644 (file)
--- a/drivers/mfd/rc5t583-irq.c
+++ b/drivers/mfd/rc5t583-irq.c
@@ -389,17 +389,10 @@ int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base)
                irq_clear_status_flags(__irq, IRQ_NOREQUEST);
        }
 
-       ret = request_threaded_irq(irq, NULL, rc5t583_irq, IRQF_ONESHOT,
-                               "rc5t583", rc5t583);
+       ret = devm_request_threaded_irq(rc5t583->dev, irq, NULL, rc5t583_irq,
+                                       IRQF_ONESHOT, "rc5t583", rc5t583);
        if (ret < 0)
                dev_err(rc5t583->dev,
                        "Error in registering interrupt error: %d\n", ret);
        return ret;
 }
-
-int rc5t583_irq_exit(struct rc5t583 *rc5t583)
-{
-       if (rc5t583->chip_irq)
-               free_irq(rc5t583->chip_irq, rc5t583);
-       return 0;
-}