diff mbox

drivers/mfd: Remove obsolete cleanup for clientdata

Message ID 1381680392-5380-1-git-send-email-wsa@the-dreams.de
State Not Applicable
Headers show

Commit Message

Wolfram Sang Oct. 13, 2013, 4:06 p.m. UTC 
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>
---
 drivers/mfd/twl6040.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Samuel Ortiz Oct. 13, 2013, 11:16 p.m. UTC | #1 
Hi Wolfram,

On Sun, Oct 13, 2013 at 06:06:12PM +0200, Wolfram Sang wrote:
> 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>
> ---
>  drivers/mfd/twl6040.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
Applied to mfd-next, thanks.

Cheers,
Samuel.
diff mbox

Patch

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);