redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

mfd: twl6040: Remove obsolete cleanup for i2c clientdata

Browse source 
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit or error. This is obsolete meanwhile, the core will do it.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Wolfram Sang 2013-10-13 18:06:12 +02:00 committed by Samuel Ortiz
parent 34c5c735a8
commit 501d609abe
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mfd/twl6040.c
View file

@ -565,13 +565,13 @@ static int twl6040_probe(struct i2c_client *client,
twl6040->supplies); twl6040->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(&client->dev, "Failed to get supplies: %d\n", ret); dev_err(&client->dev, "Failed to get supplies: %d\n", ret);
goto regulator_get_err; return ret;
} }
ret = regulator_bulk_enable(TWL6040_NUM_SUPPLIES, twl6040->supplies); ret = regulator_bulk_enable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(&client->dev, "Failed to enable supplies: %d\n", ret); dev_err(&client->dev, "Failed to enable supplies: %d\n", ret);
goto regulator_get_err; return ret;
} }
twl6040->dev = &client->dev; twl6040->dev = &client->dev;
@ -671,9 +671,6 @@ readyirq_err:
regmap_del_irq_chip(twl6040->irq, twl6040->irq_data); regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
gpio_err: gpio_err:
regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies); regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
regulator_get_err:
i2c_set_clientdata(client, NULL);
return ret; return ret;
} }
@ -689,7 +686,6 @@ static int twl6040_remove(struct i2c_client *client)
regmap_del_irq_chip(twl6040->irq, twl6040->irq_data); regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
mfd_remove_devices(&client->dev); mfd_remove_devices(&client->dev);
i2c_set_clientdata(client, NULL);
regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies); regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);