From: Wolfram Sang Date: Sun, 13 Oct 2013 16:06:12 +0000 (+0200) Subject: mfd: twl6040: Remove obsolete cleanup for i2c clientdata X-Git-Tag: upstream/snapshot3+hdmi~3955^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=501d609abe43894430eecee7f5e498607718b26b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Samuel Ortiz --- diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index daf6694..9d948af 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);