diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-07 20:42:58 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 08:54:50 +0200 |
| commit | 9c9983267deab5c268676d8ac15686923b6e5e19 (patch) | |
| tree | 1760f55fa2b65e054a4ebf6dc6bb29b980ab1f1e /drivers/mfd/as3711.c | |
| parent | mfd: act8945a: Use devm_mfd_add_devices() for mfd_device registration (diff) | |
| download | linux-9c9983267deab5c268676d8ac15686923b6e5e19.tar.xz linux-9c9983267deab5c268676d8ac15686923b6e5e19.zip | |
mfd: as3711: Use devm_mfd_add_devices() for mfd_device registration
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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/as3711.c')
| -rw-r--r-- | drivers/mfd/as3711.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c index 09e1483b99bc..67b12417585d 100644 --- 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, }; |