diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-08 00:13:11 +0530 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 07:56:42 +0100 |
| commit | 5635d994fe870a0de2614e83bbf2d70f506651eb (patch) | |
| tree | 61292244091472ec78c8379fb8fa8b37821ae502 /drivers | |
| parent | e253fb0472e7a892176c7a65cef61a6aa75f8d2e (diff) | |
| download | linux-stable-5635d994fe870a0de2614e83bbf2d70f506651eb.tar.gz linux-stable-5635d994fe870a0de2614e83bbf2d70f506651eb.tar.bz2 linux-stable-5635d994fe870a0de2614e83bbf2d70f506651eb.zip | |
mfd: tps6507x: 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: Todd Fischer <todd.fischer@ridgerun.com>
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/tps6507x.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c index 1ab3dd6c8adf..40beb2f4350c 100644 --- a/drivers/mfd/tps6507x.c +++ b/drivers/mfd/tps6507x.c @@ -100,16 +100,8 @@ static int tps6507x_i2c_probe(struct i2c_client *i2c, tps6507x->read_dev = tps6507x_i2c_read_device; tps6507x->write_dev = tps6507x_i2c_write_device; - return mfd_add_devices(tps6507x->dev, -1, tps6507x_devs, - ARRAY_SIZE(tps6507x_devs), NULL, 0, NULL); -} - -static int tps6507x_i2c_remove(struct i2c_client *i2c) -{ - struct tps6507x_dev *tps6507x = i2c_get_clientdata(i2c); - - mfd_remove_devices(tps6507x->dev); - return 0; + return devm_mfd_add_devices(tps6507x->dev, -1, tps6507x_devs, + ARRAY_SIZE(tps6507x_devs), NULL, 0, NULL); } static const struct i2c_device_id tps6507x_i2c_id[] = { @@ -132,7 +124,6 @@ static struct i2c_driver tps6507x_i2c_driver = { .of_match_table = of_match_ptr(tps6507x_of_match), }, .probe = tps6507x_i2c_probe, - .remove = tps6507x_i2c_remove, .id_table = tps6507x_i2c_id, }; |