]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mfd: tps65217: Use devm_mfd_add_devices() for mfd_device registration
authorLaxman Dewangan <ldewangan@nvidia.com>
Thu, 7 Apr 2016 18:43:12 +0000 (00:13 +0530)
committerLee Jones <lee.jones@linaro.org>
Tue, 19 Apr 2016 06:56:49 +0000 (07:56 +0100)
Use devm_mfd_add_devices() for MFD devices registration and get
rid of .remove callback to remove MFD child-devices. This is done
by managed device framework.

CC: Tony Lindgren <tony@atomide.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/tps65217.c

index d32b54426b70a3d8baf47cc9a5e47f609b5c19d1..049a6fcac6511fc579581367a8fa25e4792fa3a5 100644 (file)
@@ -205,8 +205,8 @@ static int tps65217_probe(struct i2c_client *client,
                return ret;
        }
 
-       ret = mfd_add_devices(tps->dev, -1, tps65217s,
-                             ARRAY_SIZE(tps65217s), NULL, 0, NULL);
+       ret = devm_mfd_add_devices(tps->dev, -1, tps65217s,
+                                  ARRAY_SIZE(tps65217s), NULL, 0, NULL);
        if (ret < 0) {
                dev_err(tps->dev, "mfd_add_devices failed: %d\n", ret);
                return ret;
@@ -235,15 +235,6 @@ static int tps65217_probe(struct i2c_client *client,
        return 0;
 }
 
-static int tps65217_remove(struct i2c_client *client)
-{
-       struct tps65217 *tps = i2c_get_clientdata(client);
-
-       mfd_remove_devices(tps->dev);
-
-       return 0;
-}
-
 static const struct i2c_device_id tps65217_id_table[] = {
        {"tps65217", TPS65217},
        { /* sentinel */ }
@@ -257,7 +248,6 @@ static struct i2c_driver tps65217_driver = {
        },
        .id_table       = tps65217_id_table,
        .probe          = tps65217_probe,
-       .remove         = tps65217_remove,
 };
 
 static int __init tps65217_init(void)