| Message ID | 1460054594-32325-18-git-send-email-ldewangan@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied, thanks. On Fri, 08 Apr 2016, Laxman Dewangan wrote: > 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> > CC: Todd Fischer <todd.fischer@ridgerun.com> > > --- > Changes from V1: > - Convert mfd to MFD. > - Fix checkpatch --strict error on patch. > > drivers/mfd/tps6507x.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c > index 1ab3dd6..40beb2f 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, > }; >
diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c index 1ab3dd6..40beb2f 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, };
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> CC: Todd Fischer <todd.fischer@ridgerun.com> --- Changes from V1: - Convert mfd to MFD. - Fix checkpatch --strict error on patch. drivers/mfd/tps6507x.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)