mfd: da9063: Replace regmap_add_irq_chip with devm counterpart

Use devm_regmap_add_irq_chip() instead of plain regmap_add_irq_chip(),
which removes the need for da9063_irq_exit() altogether and also
fixes a bug in da9063_device_init() where the da9063_irq_exit() was
not called in a failpath.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
index 6c2870d4e75449f12d7128c9a05245826996eac9..2647bb371d863e1096f270e4a5b079559ae9e6a0 100644 (file)
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -238,7 +238,6 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq)
 void da9063_device_exit(struct da9063 *da9063)
 {
        mfd_remove_devices(da9063->dev);
-       da9063_irq_exit(da9063);
 }
 
 MODULE_DESCRIPTION("PMIC driver for Dialog DA9063");

diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
index 207bbfe55449fe01ebe6f6992599a52f56af8591..da6ceb41f0d1559bd9e98ab8aebb8da3c3f6809f 100644 (file)
--- a/drivers/mfd/da9063-irq.c
+++ b/drivers/mfd/da9063-irq.c
@@ -170,7 +170,8 @@ int da9063_irq_init(struct da9063 *da9063)
                return -EINVAL;
        }
 
-       ret = regmap_add_irq_chip(da9063->regmap, da9063->chip_irq,
+       ret = devm_regmap_add_irq_chip(da9063->dev, da9063->regmap,
+                       da9063->chip_irq,
                        IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED,
                        da9063->irq_base, &da9063_irq_chip,
                        &da9063->regmap_irq);
@@ -182,8 +183,3 @@ int da9063_irq_init(struct da9063 *da9063)
 
        return 0;
 }
-
-void da9063_irq_exit(struct da9063 *da9063)
-{
-       regmap_del_irq_chip(da9063->chip_irq, da9063->regmap_irq);
-}

diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
index f3ae65db4c8644a837f63b26c021c1264bb83d8d..9ab7049977aa36f8eda8c21670a7373bdc70d300 100644 (file)
--- a/include/linux/mfd/da9063/core.h
+++ b/include/linux/mfd/da9063/core.h
@@ -95,6 +95,5 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq);
 int da9063_irq_init(struct da9063 *da9063);
 
 void da9063_device_exit(struct da9063 *da9063);
-void da9063_irq_exit(struct da9063 *da9063);
 
 #endif /* __MFD_DA9063_CORE_H__ */