diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-21 14:25:58 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-05-09 14:27:39 +0200 |
| commit | 14856f75825f77b13564a8cc71deb21409671ab1 (patch) | |
| tree | 5a100fa4853ca9f101639e8639d48ed8875c8f96 /drivers | |
| parent | mfd: tps65910: Use devm_mfd_add_devices and devm_regmap_add_irq_chip (diff) | |
| download | linux-14856f75825f77b13564a8cc71deb21409671ab1.tar.xz linux-14856f75825f77b13564a8cc71deb21409671ab1.zip | |
mfd: wl1273-core: 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.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/wl1273-core.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c index f7c52d901040..708046592b33 100644 --- a/drivers/mfd/wl1273-core.c +++ b/drivers/mfd/wl1273-core.c @@ -170,15 +170,6 @@ static int wl1273_fm_set_volume(struct wl1273_core *core, unsigned int volume) return 0; } -static int wl1273_core_remove(struct i2c_client *client) -{ - dev_dbg(&client->dev, "%s\n", __func__); - - mfd_remove_devices(&client->dev); - - return 0; -} - static int wl1273_core_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -237,8 +228,8 @@ static int wl1273_core_probe(struct i2c_client *client, dev_dbg(&client->dev, "%s: number of children: %d.\n", __func__, children); - r = mfd_add_devices(&client->dev, -1, core->cells, - children, NULL, 0, NULL); + r = devm_mfd_add_devices(&client->dev, -1, core->cells, + children, NULL, 0, NULL); if (r) goto err; @@ -258,7 +249,6 @@ static struct i2c_driver wl1273_core_driver = { }, .probe = wl1273_core_probe, .id_table = wl1273_driver_id_table, - .remove = wl1273_core_remove, }; static int __init wl1273_core_init(void) |