mfd: menf21bmc: Use devm_mfd_add_devices() for mfd_device registration

[deliverable/linux.git] / drivers / mfd / as3711.c

diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index 09e1483b99bc921ffbb81b3bd5d6cc8fc159d3ec..67b12417585d18301170289a50858292e1af807e 100644 (file)
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -189,22 +189,14 @@ static int as3711_i2c_probe(struct i2c_client *client,
                as3711_subdevs[AS3711_BACKLIGHT].pdata_size = 0;
        }
 
-       ret = mfd_add_devices(as3711->dev, -1, as3711_subdevs,
-                             ARRAY_SIZE(as3711_subdevs), NULL, 0, NULL);
+       ret = devm_mfd_add_devices(as3711->dev, -1, as3711_subdevs,
+                                  ARRAY_SIZE(as3711_subdevs), NULL, 0, NULL);
        if (ret < 0)
                dev_err(&client->dev, "add mfd devices failed: %d\n", ret);
 
        return ret;
 }
 
-static int as3711_i2c_remove(struct i2c_client *client)
-{
-       struct as3711 *as3711 = i2c_get_clientdata(client);
-
-       mfd_remove_devices(as3711->dev);
-       return 0;
-}
-
 static const struct i2c_device_id as3711_i2c_id[] = {
        {.name = "as3711", .driver_data = 0},
        {}
@@ -218,7 +210,6 @@ static struct i2c_driver as3711_i2c_driver = {
                   .of_match_table = of_match_ptr(as3711_of_match),
        },
        .probe = as3711_i2c_probe,
-       .remove = as3711_i2c_remove,
        .id_table = as3711_i2c_id,
 };