diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-07 21:43:09 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 09:56:28 +0300 |
| commit | 69633beaebf345cde6672a9ac7679c88fc0c3245 (patch) | |
| tree | 2b8dae7f52c8404cc84208ff66c130ce1b8c92af /drivers/mfd | |
| parent | 6b719eba9f01cd65ede04e64f20f648f8dbe6359 (diff) | |
| download | linux-69633beaebf345cde6672a9ac7679c88fc0c3245.tar.xz | |
mfd: sky81452: 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: Gyungoh Yoo <jack.yoo@skyworksinc.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/sky81452.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/mfd/sky81452.c b/drivers/mfd/sky81452.c index b0c9b0415650..30a2a677100f 100644 --- a/drivers/mfd/sky81452.c +++ b/drivers/mfd/sky81452.c @@ -64,19 +64,14 @@ static int sky81452_probe(struct i2c_client *client, cells[1].platform_data = pdata->regulator_init_data; cells[1].pdata_size = sizeof(*pdata->regulator_init_data); - ret = mfd_add_devices(dev, -1, cells, ARRAY_SIZE(cells), NULL, 0, NULL); + ret = devm_mfd_add_devices(dev, -1, cells, ARRAY_SIZE(cells), + NULL, 0, NULL); if (ret) dev_err(dev, "failed to add child devices. err=%d\n", ret); return ret; } -static int sky81452_remove(struct i2c_client *client) -{ - mfd_remove_devices(&client->dev); - return 0; -} - static const struct i2c_device_id sky81452_ids[] = { { "sky81452" }, { } @@ -97,7 +92,6 @@ static struct i2c_driver sky81452_driver = { .of_match_table = of_match_ptr(sky81452_of_match), }, .probe = sky81452_probe, - .remove = sky81452_remove, .id_table = sky81452_ids, }; |