]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
i2c: Remove obsolete cleanup for clientdata
authorWolfram Sang <w.sang@pengutronix.de>
Thu, 30 Sep 2010 12:14:22 +0000 (14:14 +0200)
committerJean Delvare <khali@endymion.delvare>
Thu, 30 Sep 2010 12:14:22 +0000 (14:14 +0200)
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit. This is obsolete meanwhile, so fix it and hope the word will spread.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/misc/bh1780gli.c
drivers/regulator/ad5398.c
drivers/regulator/isl6271a-regulator.c
drivers/rtc/rtc-ds3232.c

index 714c6b487313a4ad7b360687591b75a6cddedc55..d5f3a3fd231931508948a9b0227aae2a3648a96f 100644 (file)
@@ -190,7 +190,6 @@ static int __devexit bh1780_remove(struct i2c_client *client)
 
        ddata = i2c_get_clientdata(client);
        sysfs_remove_group(&client->dev.kobj, &bh1780_attr_group);
-       i2c_set_clientdata(client, NULL);
        kfree(ddata);
 
        return 0;
index df1fb53c09d266ff9369add1303c47f3d24702ab..a4be41614eebd41fa5733c09a7e9645c64c72c59 100644 (file)
@@ -256,7 +256,6 @@ static int __devexit ad5398_remove(struct i2c_client *client)
 
        regulator_unregister(chip->rdev);
        kfree(chip);
-       i2c_set_clientdata(client, NULL);
 
        return 0;
 }
index d61ecb885a8c94e857e78dcb23452ee9540385f0..b8cc6389a541a0e3cbc0cc4a60231c166cd2e2e1 100644 (file)
@@ -191,8 +191,6 @@ static int __devexit isl6271a_remove(struct i2c_client *i2c)
        struct isl_pmic *pmic = i2c_get_clientdata(i2c);
        int i;
 
-       i2c_set_clientdata(i2c, NULL);
-
        for (i = 0; i < 3; i++)
                regulator_unregister(pmic->rdev[i]);
 
index 9daed8db83d3e5400559ac3c51c86d0e6b45f00d..9de8516e3531e70bad818747f41de4b8052486bd 100644 (file)
@@ -268,7 +268,6 @@ out_irq:
                free_irq(client->irq, client);
 
 out_free:
-       i2c_set_clientdata(client, NULL);
        kfree(ds3232);
        return ret;
 }
@@ -287,7 +286,6 @@ static int __devexit ds3232_remove(struct i2c_client *client)
        }
 
        rtc_device_unregister(ds3232->rtc);
-       i2c_set_clientdata(client, NULL);
        kfree(ds3232);
        return 0;
 }