Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75d4c5e0 authored by Keerthy's avatar Keerthy Committed by Lee Jones
Browse files

mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe() 



Use devm_regmap_add_irq_chip and clean up error path in probe
and also the remove function.

Reported-by: default avatarChristian Hohnstaedt <Christian.Hohnstaedt@wago.com>
Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 38df91cc

drivers/mfd/tps65218.c

+3 −21
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int tps65218_probe(struct i2c_client *client, 


	mutex_init(&tps->tps_lock);



	ret = regmap_add_irq_chip(tps->regmap, tps->irq,

	ret = devm_regmap_add_irq_chip(&client->dev, tps->regmap, tps->irq,

				       IRQF_ONESHOT, 0, &tps65218_irq_chip,

				       &tps->irq_data);

	if (ret < 0)
@@ -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 struct i2c_driver tps65218_driver = { 
		.of_match_table = of_tps65218_match_table,

	},

	.probe		= tps65218_probe,

	.remove		= tps65218_remove,

	.id_table       = tps65218_id_table,

};