mfd: twl6040: Remove obsolete cleanup for i2c clientdata
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:
parent
34c5c735a8
commit
501d609abe
|
@ -565,13 +565,13 @@ static int twl6040_probe(struct i2c_client *client,
|
|||
twl6040->supplies);
|
||||
if (ret != 0) {
|
||||
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);
|
||||
if (ret != 0) {
|
||||
dev_err(&client->dev, "Failed to enable supplies: %d\n", ret);
|
||||
goto regulator_get_err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
twl6040->dev = &client->dev;
|
||||
|
@ -671,9 +671,6 @@ readyirq_err:
|
|||
regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
|
||||
gpio_err:
|
||||
regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
|
||||
regulator_get_err:
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -689,7 +686,6 @@ static int twl6040_remove(struct i2c_client *client)
|
|||
regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
|
||||
|
||||
mfd_remove_devices(&client->dev);
|
||||
i2c_set_clientdata(client, NULL);
|
||||
|
||||
regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
|
||||
|
||||
|
|
Loading…
Reference in New Issue