mfd: max8997: Remove unused function max8997_irq_exit()

Utilise devm_*() managed resource helpers for freeing IRQs instead.

Reported-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c
index 93a3b1698d9c27672d472babbbad99c126a351f0..92e348df03d1e177ec823cd5d9187e90266a27df 100644 (file)
--- a/drivers/mfd/max8997-irq.c
+++ b/drivers/mfd/max8997-irq.c
@@ -335,7 +335,8 @@ int max8997_irq_init(struct max8997_dev *max8997)
        }
        max8997->irq_domain = domain;
 
-       ret = request_threaded_irq(max8997->irq, NULL, max8997_irq_thread,
+       ret = devm_request_threaded_irq(max8997->dev, max8997->irq, NULL,
+                       max8997_irq_thread,
                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                        "max8997-irq", max8997);
 
@@ -348,7 +349,8 @@ int max8997_irq_init(struct max8997_dev *max8997)
        if (!max8997->ono)
                return 0;
 
-       ret = request_threaded_irq(max8997->ono, NULL, max8997_irq_thread,
+       ret = devm_request_threaded_irq(max8997->dev, max8997->ono, NULL,
+                       max8997_irq_thread,
                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING |
                        IRQF_ONESHOT, "max8997-ono", max8997);
 
@@ -358,12 +360,3 @@ int max8997_irq_init(struct max8997_dev *max8997)
 
        return 0;
 }
-
-void max8997_irq_exit(struct max8997_dev *max8997)
-{
-       if (max8997->ono)
-               free_irq(max8997->ono, max8997);
-
-       if (max8997->irq)
-               free_irq(max8997->irq, max8997);
-}

diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index a10cd69452321243ce588d89495ea1343aaef974..f70eea0f226463cd6f37a5d684f0b2975e81c432 100644 (file)
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -397,7 +397,6 @@ enum max8997_types {
 };
 
 extern int max8997_irq_init(struct max8997_dev *max8997);
-extern void max8997_irq_exit(struct max8997_dev *max8997);
 extern int max8997_irq_resume(struct max8997_dev *max8997);
 
 extern int max8997_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest);