OSDN Git Service

mfd: lp3943: Use devm_mfd_add_devices() for mfd_device registration
authorLaxman Dewangan <ldewangan@nvidia.com>
Thu, 7 Apr 2016 18:43:02 +0000 (00:13 +0530)
committerLee Jones <lee.jones@linaro.org>
Tue, 19 Apr 2016 06:55:23 +0000 (07:55 +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: Milo Kim <milo.kim@ti.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Milo Kim <milo.kim@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/lp3943.c

index eecbb13..65a2a8f 100644 (file)
@@ -123,16 +123,9 @@ static int lp3943_probe(struct i2c_client *cl, const struct i2c_device_id *id)
        lp3943->mux_cfg = lp3943_mux_cfg;
        i2c_set_clientdata(cl, lp3943);
 
-       return mfd_add_devices(dev, -1, lp3943_devs, ARRAY_SIZE(lp3943_devs),
-                              NULL, 0, NULL);
-}
-
-static int lp3943_remove(struct i2c_client *cl)
-{
-       struct lp3943 *lp3943 = i2c_get_clientdata(cl);
-
-       mfd_remove_devices(lp3943->dev);
-       return 0;
+       return devm_mfd_add_devices(dev, -1, lp3943_devs,
+                                   ARRAY_SIZE(lp3943_devs),
+                                   NULL, 0, NULL);
 }
 
 static const struct i2c_device_id lp3943_ids[] = {
@@ -151,7 +144,6 @@ MODULE_DEVICE_TABLE(of, lp3943_of_match);
 
 static struct i2c_driver lp3943_driver = {
        .probe = lp3943_probe,
-       .remove = lp3943_remove,
        .driver = {
                .name = "lp3943",
                .of_match_table = of_match_ptr(lp3943_of_match),