From: Cosmin Tanislav <cosmin.tanislav@xxxxxxxxxx>
To simplify the core driver remove function.
Signed-off-by: Cosmin Tanislav <cosmin.tanislav@xxxxxxxxxx>
---
drivers/hwmon/adt7x10.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/adt7x10.c b/drivers/hwmon/adt7x10.c
index dbe9f1ad7db0..48adc0344e88 100644
--- a/drivers/hwmon/adt7x10.c
+++ b/drivers/hwmon/adt7x10.c
@@ -402,9 +402,11 @@ int adt7x10_probe(struct device *dev, const char *name, int irq,
}
if (irq > 0) {
- ret = request_threaded_irq(irq, NULL, adt7x10_irq_handler,
- IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
- dev_name(dev), dev);
+ ret = devm_request_threaded_irq(dev, irq, NULL,
+ adt7x10_irq_handler,
+ IRQF_TRIGGER_FALLING |
+ IRQF_ONESHOT,
+ dev_name(dev), dev);
if (ret)
goto exit_hwmon_device_unregister;
}
@@ -425,9 +427,6 @@ void adt7x10_remove(struct device *dev, int irq)
{
struct adt7x10_data *data = dev_get_drvdata(dev);
- if (irq > 0)
- free_irq(irq, dev);
-
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&dev->kobj, &adt7x10_group);
if (data->oldconfig != data->config)
--
2.34.1
