Hi, On Sun, Dec 09, 2018 at 07:29:31PM +0530, Keerthy wrote: > Use devm_regmap_add_irq_chip and clean up error path in probe > and also the remove function. > > Reported-by: Christian Hohnstaedt <[email protected]> > Signed-off-by: Keerthy <[email protected]> > ---
Reviewed-by: Sebastian Reichel <[email protected]> -- Sebastian > > Changes in v2: > > * Cleaned up remove function as well. > > Changes in v3: > > * Deleted the remove function which was just returning 0 > > drivers/mfd/tps65218.c | 24 +++--------------------- > 1 file changed, 3 insertions(+), 21 deletions(-) > > diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c > index 910f569..8bcdecf 100644 > --- a/drivers/mfd/tps65218.c > +++ b/drivers/mfd/tps65218.c > @@ -235,9 +235,9 @@ static int tps65218_probe(struct i2c_client *client, > > mutex_init(&tps->tps_lock); > > - ret = regmap_add_irq_chip(tps->regmap, tps->irq, > - IRQF_ONESHOT, 0, &tps65218_irq_chip, > - &tps->irq_data); > + ret = devm_regmap_add_irq_chip(&client->dev, tps->regmap, tps->irq, > + IRQF_ONESHOT, 0, &tps65218_irq_chip, > + &tps->irq_data); > if (ret < 0) > return ret; > > @@ -253,26 +253,9 @@ static int tps65218_probe(struct i2c_client *client, > ARRAY_SIZE(tps65218_cells), NULL, 0, > regmap_irq_get_domain(tps->irq_data)); > > - if (ret < 0) > - goto err_irq; > - > - return 0; > - > -err_irq: > - regmap_del_irq_chip(tps->irq, tps->irq_data); > - > return ret; > } > > -static int tps65218_remove(struct i2c_client *client) > -{ > - struct tps65218 *tps = i2c_get_clientdata(client); > - > - regmap_del_irq_chip(tps->irq, tps->irq_data); > - > - return 0; > -} > - > static const struct i2c_device_id tps65218_id_table[] = { > { "tps65218", TPS65218 }, > { }, > @@ -285,7 +268,6 @@ static int tps65218_remove(struct i2c_client *client) > .of_match_table = of_tps65218_match_table, > }, > .probe = tps65218_probe, > - .remove = tps65218_remove, > .id_table = tps65218_id_table, > }; > > -- > 1.9.1 >
signature.asc
Description: PGP signature
