| Message ID | 1461241558-26983-7-git-send-email-ldewangan@nvidia.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, 21 Apr 2016, Laxman Dewangan wrote: > Use devm_mfd_add_devices() for adding MFD child devices and > devm_regmap_add_irq_chip() for IRQ chip registration. > > This reduces the error code path and .remove callback for removing > MFD child devices and deleting IRQ chip data. > > Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> > CC: Tony Lindgren <tony@atomide.com> > CC: linux-omap@vger.kernel.org > --- > drivers/mfd/tps65910.c | 25 ++++--------------------- > 1 file changed, 4 insertions(+), 21 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c > index 8086e5d..11cab15 100644 > --- a/drivers/mfd/tps65910.c > +++ b/drivers/mfd/tps65910.c > @@ -252,9 +252,10 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq, > } > > tps65910->chip_irq = irq; > - ret = regmap_add_irq_chip(tps65910->regmap, tps65910->chip_irq, > - IRQF_ONESHOT, pdata->irq_base, > - tps6591x_irqs_chip, &tps65910->irq_data); > + ret = devm_regmap_add_irq_chip(tps65910->dev, tps65910->regmap, > + tps65910->chip_irq, > + IRQF_ONESHOT, pdata->irq_base, > + tps6591x_irqs_chip, &tps65910->irq_data); > if (ret < 0) { > dev_warn(tps65910->dev, "Failed to add irq_chip %d\n", ret); > tps65910->chip_irq = 0; > @@ -262,13 +263,6 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq, > return ret; > } > > -static int tps65910_irq_exit(struct tps65910 *tps65910) > -{ > - if (tps65910->chip_irq > 0) > - regmap_del_irq_chip(tps65910->chip_irq, tps65910->irq_data); > - return 0; > -} > - > static bool is_volatile_reg(struct device *dev, unsigned int reg) > { > struct tps65910 *tps65910 = dev_get_drvdata(dev); > @@ -516,22 +510,12 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, > regmap_irq_get_domain(tps65910->irq_data)); > if (ret < 0) { > dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret); > - tps65910_irq_exit(tps65910); > return ret; > } > > return ret; > } > > -static int tps65910_i2c_remove(struct i2c_client *i2c) > -{ > - struct tps65910 *tps65910 = i2c_get_clientdata(i2c); > - > - tps65910_irq_exit(tps65910); > - > - return 0; > -} > - > static const struct i2c_device_id tps65910_i2c_id[] = { > { "tps65910", TPS65910 }, > { "tps65911", TPS65911 }, > @@ -546,7 +530,6 @@ static struct i2c_driver tps65910_i2c_driver = { > .of_match_table = of_match_ptr(tps65910_of_match), > }, > .probe = tps65910_i2c_probe, > - .remove = tps65910_i2c_remove, > .id_table = tps65910_i2c_id, > }; >
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index 8086e5d..11cab15 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c @@ -252,9 +252,10 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq, } tps65910->chip_irq = irq; - ret = regmap_add_irq_chip(tps65910->regmap, tps65910->chip_irq, - IRQF_ONESHOT, pdata->irq_base, - tps6591x_irqs_chip, &tps65910->irq_data); + ret = devm_regmap_add_irq_chip(tps65910->dev, tps65910->regmap, + tps65910->chip_irq, + IRQF_ONESHOT, pdata->irq_base, + tps6591x_irqs_chip, &tps65910->irq_data); if (ret < 0) { dev_warn(tps65910->dev, "Failed to add irq_chip %d\n", ret); tps65910->chip_irq = 0; @@ -262,13 +263,6 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq, return ret; } -static int tps65910_irq_exit(struct tps65910 *tps65910) -{ - if (tps65910->chip_irq > 0) - regmap_del_irq_chip(tps65910->chip_irq, tps65910->irq_data); - return 0; -} - static bool is_volatile_reg(struct device *dev, unsigned int reg) { struct tps65910 *tps65910 = dev_get_drvdata(dev); @@ -516,22 +510,12 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, regmap_irq_get_domain(tps65910->irq_data)); if (ret < 0) { dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret); - tps65910_irq_exit(tps65910); return ret; } return ret; } -static int tps65910_i2c_remove(struct i2c_client *i2c) -{ - struct tps65910 *tps65910 = i2c_get_clientdata(i2c); - - tps65910_irq_exit(tps65910); - - return 0; -} - static const struct i2c_device_id tps65910_i2c_id[] = { { "tps65910", TPS65910 }, { "tps65911", TPS65911 }, @@ -546,7 +530,6 @@ static struct i2c_driver tps65910_i2c_driver = { .of_match_table = of_match_ptr(tps65910_of_match), }, .probe = tps65910_i2c_probe, - .remove = tps65910_i2c_remove, .id_table = tps65910_i2c_id, };
Use devm_mfd_add_devices() for adding MFD child devices and devm_regmap_add_irq_chip() for IRQ chip registration. This reduces the error code path and .remove callback for removing MFD child devices and deleting IRQ chip data. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> CC: Tony Lindgren <tony@atomide.com> CC: linux-omap@vger.kernel.org --- drivers/mfd/tps65910.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-)