mfd: da9063: Replace mfd_add_devices with devm counterpart

Use devm_mfd_add_devices() instead of plain mfd_add_devices(), which
removes the need for da9063_device_exit() altogether and also for the
.remove callback in da9063-i2c.c .

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 2647bb371d863e1096f270e4a5b079559ae9e6a0..76258e5709f85f9e04f72050715d82d284f5515a 100644 (file)
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -226,20 +226,15 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq)
 
        da9063->irq_base = regmap_irq_chip_get_base(da9063->regmap_irq);
 
-       ret = mfd_add_devices(da9063->dev, -1, da9063_devs,
-                             ARRAY_SIZE(da9063_devs), NULL, da9063->irq_base,
-                             NULL);
+       ret = devm_mfd_add_devices(da9063->dev, -1, da9063_devs,
+                                  ARRAY_SIZE(da9063_devs), NULL,
+                                  da9063->irq_base, NULL);
        if (ret)
                dev_err(da9063->dev, "Cannot add MFD cells\n");
 
        return ret;
 }
 
-void da9063_device_exit(struct da9063 *da9063)
-{
-       mfd_remove_devices(da9063->dev);
-}
-
 MODULE_DESCRIPTION("PMIC driver for Dialog DA9063");
 MODULE_AUTHOR("Krystian Garbaciak");
 MODULE_AUTHOR("Michal Hajduk");

diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index 981805a2c52123a379e12f20bdc3fec5642f58eb..29456e807ed43816ab30ee0b84f3acd6ffdae9aa 100644 (file)
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -270,15 +270,6 @@ static int da9063_i2c_probe(struct i2c_client *i2c,
        return da9063_device_init(da9063, i2c->irq);
 }
 
-static int da9063_i2c_remove(struct i2c_client *i2c)
-{
-       struct da9063 *da9063 = i2c_get_clientdata(i2c);
-
-       da9063_device_exit(da9063);
-
-       return 0;
-}
-
 static const struct i2c_device_id da9063_i2c_id[] = {
        {"da9063", PMIC_DA9063},
        {},
@@ -291,7 +282,6 @@ static struct i2c_driver da9063_i2c_driver = {
                .of_match_table = of_match_ptr(da9063_dt_ids),
        },
        .probe    = da9063_i2c_probe,
-       .remove   = da9063_i2c_remove,
        .id_table = da9063_i2c_id,
 };
 

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