diff options
| author |   Wolfram Sang <wsa@the-dreams.de> | 2013-10-13 18:06:12 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2013-10-24 12:08:23 +0200 |
| commit | 501d609abe43894430eecee7f5e498607718b26b (patch) | |
| tree | 890a473df56aaaedc6a9026c12ced3012d13b6b4 /drivers/mfd/twl6040.c | |
| parent | mfd: tps65910: Remove warning during dt node parsing (diff) | |
| download | linux-dev-501d609abe43894430eecee7f5e498607718b26b.tar.xz linux-dev-501d609abe43894430eecee7f5e498607718b26b.zip | |
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>
Diffstat (limited to 'drivers/mfd/twl6040.c')
| -rw-r--r-- | drivers/mfd/twl6040.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index daf66942071c..9d948af420db 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c @@ -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); |