summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Jones <lee@kernel.org>2025-02-11 14:28:05 +0000
committerLee Jones <lee@kernel.org>2025-03-14 08:59:06 +0000
commit417206a22669a0adeeaeedab2c8364fd021e3533 (patch)
tree9add36898ab5f453db5efabbc3420b795c5af1cf
parent616821ea6c1872b22f171dfbeb6436a319448c6e (diff)
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>
-rw-r--r--drivers/mfd/max8997-irq.c15
-rw-r--r--include/linux/mfd/max8997-private.h1
2 files changed, 4 insertions, 12 deletions
diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c
index 93a3b1698d9c..92e348df03d1 100644
--- 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 a10cd6945232..f70eea0f2264 100644
--- 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);