Commit 14856f75 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Lee Jones

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: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6167c5bc
...@@ -170,15 +170,6 @@ static int wl1273_fm_set_volume(struct wl1273_core *core, unsigned int volume) ...@@ -170,15 +170,6 @@ static int wl1273_fm_set_volume(struct wl1273_core *core, unsigned int volume)
return 0; 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, static int wl1273_core_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -237,8 +228,8 @@ static int wl1273_core_probe(struct i2c_client *client, ...@@ -237,8 +228,8 @@ static int wl1273_core_probe(struct i2c_client *client,
dev_dbg(&client->dev, "%s: number of children: %d.\n", dev_dbg(&client->dev, "%s: number of children: %d.\n",
__func__, children); __func__, children);
r = mfd_add_devices(&client->dev, -1, core->cells, r = devm_mfd_add_devices(&client->dev, -1, core->cells,
children, NULL, 0, NULL); children, NULL, 0, NULL);
if (r) if (r)
goto err; goto err;
...@@ -258,7 +249,6 @@ static struct i2c_driver wl1273_core_driver = { ...@@ -258,7 +249,6 @@ static struct i2c_driver wl1273_core_driver = {
}, },
.probe = wl1273_core_probe, .probe = wl1273_core_probe,
.id_table = wl1273_driver_id_table, .id_table = wl1273_driver_id_table,
.remove = wl1273_core_remove,
}; };
static int __init wl1273_core_init(void) static int __init wl1273_core_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment