TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 75d4c5e03c2ae9902ab521024b10291f6fc9515b ]

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

Reported-by: Christian Hohnstaedt <Christian.Hohnstaedt@wago.com>
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Keerthy
2018-12-09 19:29:31 +05:30
committed by Greg Kroah-Hartman
parent beaf260ec8
commit e42296ae45
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mfd/tps65218.c
View File

@@ -235,7 +235,7 @@ static int tps65218_probe(struct i2c_client *client,
mutex_init(&tps->tps_lock); 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, IRQF_ONESHOT, 0, &tps65218_irq_chip,
&tps->irq_data); &tps->irq_data);
if (ret < 0) if (ret < 0)
@@ -253,26 +253,9 @@ static int tps65218_probe(struct i2c_client *client,
ARRAY_SIZE(tps65218_cells), NULL, 0, ARRAY_SIZE(tps65218_cells), NULL, 0,
regmap_irq_get_domain(tps->irq_data)); 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; 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[] = { static const struct i2c_device_id tps65218_id_table[] = {
{ "tps65218", TPS65218 }, { "tps65218", TPS65218 },
{ }, { },
@@ -285,7 +268,6 @@ static struct i2c_driver tps65218_driver = {
.of_match_table = of_tps65218_match_table, .of_match_table = of_tps65218_match_table,
}, },
.probe = tps65218_probe, .probe = tps65218_probe,
.remove = tps65218_remove,
.id_table = tps65218_id_table, .id_table = tps65218_id_table,
}; };