diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-07 14:43:13 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 02:56:56 -0400 |
commit | f3466e7764783ed4fae91ebe1653b0a08cca22bf (patch) | |
tree | 2fa71cac1b03a35885e7422c29496ba339d67dcf /drivers/mfd | |
parent | b89b6b6bcd570a0beb1fc6fb8d0ecc20316413ab (diff) |
mfd: tps65910: Use devm_mfd_add_devices() for mfd_device registration
Use devm_mfd_add_devices() for MFD devices registration and remove
the call of mfd_remove_devices() from .remove callback to remove
MFD child-devices. This is done by managed device framework.
CC: Tony Lindgren <tony@atomide.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/tps65910.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index f7ab115483a9..8086e5dae311 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c | |||
@@ -510,10 +510,10 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, | |||
510 | pm_power_off = tps65910_power_off; | 510 | pm_power_off = tps65910_power_off; |
511 | } | 511 | } |
512 | 512 | ||
513 | ret = mfd_add_devices(tps65910->dev, -1, | 513 | ret = devm_mfd_add_devices(tps65910->dev, -1, |
514 | tps65910s, ARRAY_SIZE(tps65910s), | 514 | tps65910s, ARRAY_SIZE(tps65910s), |
515 | NULL, 0, | 515 | NULL, 0, |
516 | regmap_irq_get_domain(tps65910->irq_data)); | 516 | regmap_irq_get_domain(tps65910->irq_data)); |
517 | if (ret < 0) { | 517 | if (ret < 0) { |
518 | dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret); | 518 | dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret); |
519 | tps65910_irq_exit(tps65910); | 519 | tps65910_irq_exit(tps65910); |
@@ -528,7 +528,6 @@ static int tps65910_i2c_remove(struct i2c_client *i2c) | |||
528 | struct tps65910 *tps65910 = i2c_get_clientdata(i2c); | 528 | struct tps65910 *tps65910 = i2c_get_clientdata(i2c); |
529 | 529 | ||
530 | tps65910_irq_exit(tps65910); | 530 | tps65910_irq_exit(tps65910); |
531 | mfd_remove_devices(tps65910->dev); | ||
532 | 531 | ||
533 | return 0; | 532 | return 0; |
534 | } | 533 | } |