OSDN Git Service

mfd: rn5t618: Use devm_mfd_add_devices() for mfd_device registration
authorLaxman Dewangan <ldewangan@nvidia.com>
Thu, 7 Apr 2016 18:43:07 +0000 (00:13 +0530)
committerLee Jones <lee.jones@linaro.org>
Tue, 19 Apr 2016 06:56:06 +0000 (07:56 +0100)
Use devm_mfd_add_devices() for MFD devices registration and remove
the call of mfd_remove_devices() from .remove callback to remove
MFD child-devices. This is done by managed device framework.

CC: Beniamino Galvani <b.galvani@gmail.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/rn5t618.c

index 6668571..0ad51d7 100644 (file)
@@ -78,8 +78,8 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c,
                return ret;
        }
 
-       ret = mfd_add_devices(&i2c->dev, -1, rn5t618_cells,
-                             ARRAY_SIZE(rn5t618_cells), NULL, 0, NULL);
+       ret = devm_mfd_add_devices(&i2c->dev, -1, rn5t618_cells,
+                                  ARRAY_SIZE(rn5t618_cells), NULL, 0, NULL);
        if (ret) {
                dev_err(&i2c->dev, "failed to add sub-devices: %d\n", ret);
                return ret;
@@ -102,7 +102,6 @@ static int rn5t618_i2c_remove(struct i2c_client *i2c)
                pm_power_off = NULL;
        }
 
-       mfd_remove_devices(&i2c->dev);
        return 0;
 }