Skip to content

Commit

Permalink
regulator: remove use of __devexit
Browse files Browse the repository at this point in the history
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
wfp5p authored and broonie committed Nov 20, 2012
1 parent ce6dd5d commit 8dc995f
Show file tree
Hide file tree
Showing 56 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion drivers/regulator/88pm8607.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ static int pm8607_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit pm8607_regulator_remove(struct platform_device *pdev)
static int pm8607_regulator_remove(struct platform_device *pdev)
{
struct pm8607_regulator_info *info = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/aat2870-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit aat2870_regulator_remove(struct platform_device *pdev)
static int aat2870_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/ab3100.c
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ static int ab3100_regulators_probe(struct platform_device *pdev)
return 0;
}

static int __devexit ab3100_regulators_remove(struct platform_device *pdev)
static int ab3100_regulators_remove(struct platform_device *pdev)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/ab8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
return 0;
}

static __devexit int ab8500_regulator_remove(struct platform_device *pdev)
static int ab8500_regulator_remove(struct platform_device *pdev)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/ad5398.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int ad5398_probe(struct i2c_client *client,
return ret;
}

static int __devexit ad5398_remove(struct i2c_client *client)
static int ad5398_remove(struct i2c_client *client)
{
struct ad5398_chip_info *chip = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/anatop-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)
return ret;
}

static int __devexit anatop_regulator_remove(struct platform_device *pdev)
static int anatop_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);
struct anatop_regulator *sreg = rdev_get_drvdata(rdev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/arizona-ldo1.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
return 0;
}

static __devexit int arizona_ldo1_remove(struct platform_device *pdev)
static int arizona_ldo1_remove(struct platform_device *pdev)
{
struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/arizona-micsupp.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
return 0;
}

static __devexit int arizona_micsupp_remove(struct platform_device *pdev)
static int arizona_micsupp_remove(struct platform_device *pdev)
{
struct arizona_micsupp *micsupp = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/da903x.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ static int da903x_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit da903x_regulator_remove(struct platform_device *pdev)
static int da903x_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/da9052-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ static int da9052_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit da9052_regulator_remove(struct platform_device *pdev)
static int da9052_regulator_remove(struct platform_device *pdev)
{
struct da9052_regulator *regulator = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/dbx500-prcmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ ux500_regulator_debug_init(struct platform_device *pdev,
return -ENOMEM;
}

int __devexit ux500_regulator_debug_exit(void)
int ux500_regulator_debug_exit(void)
{
debugfs_remove_recursive(rdebug.dir);
kfree(rdebug.state_after_suspend);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/fan53555.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int fan53555_regulator_probe(struct i2c_client *client,

}

static int __devexit fan53555_regulator_remove(struct i2c_client *client)
static int fan53555_regulator_remove(struct i2c_client *client)
{
struct fan53555_device_info *di = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/fixed.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
return ret;
}

static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev)
static int reg_fixed_voltage_remove(struct platform_device *pdev)
{
struct fixed_voltage_data *drvdata = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/gpio-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
return ret;
}

static int __devexit gpio_regulator_remove(struct platform_device *pdev)
static int gpio_regulator_remove(struct platform_device *pdev)
{
struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/isl6271a-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static int isl6271a_probe(struct i2c_client *i2c,
return err;
}

static int __devexit isl6271a_remove(struct i2c_client *i2c)
static int isl6271a_remove(struct i2c_client *i2c)
{
struct isl_pmic *pmic = i2c_get_clientdata(i2c);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/lp3971.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static int lp3971_i2c_probe(struct i2c_client *i2c,
return ret;
}

static int __devexit lp3971_i2c_remove(struct i2c_client *i2c)
static int lp3971_i2c_remove(struct i2c_client *i2c)
{
struct lp3971 *lp3971 = i2c_get_clientdata(i2c);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/lp3972.c
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ static int lp3972_i2c_probe(struct i2c_client *i2c,
return ret;
}

static int __devexit lp3972_i2c_remove(struct i2c_client *i2c)
static int lp3972_i2c_remove(struct i2c_client *i2c)
{
struct lp3972 *lp3972 = i2c_get_clientdata(i2c);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/lp872x.c
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
return ret;
}

static int __devexit lp872x_remove(struct i2c_client *cl)
static int lp872x_remove(struct i2c_client *cl)
{
struct lp872x *lp = i2c_get_clientdata(cl);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/lp8788-buck.c
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ static int lp8788_buck_probe(struct platform_device *pdev)
return 0;
}

static int __devexit lp8788_buck_remove(struct platform_device *pdev)
static int lp8788_buck_remove(struct platform_device *pdev)
{
struct lp8788_buck *buck = platform_get_drvdata(pdev);

Expand Down
4 changes: 2 additions & 2 deletions drivers/regulator/lp8788-ldo.c
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ static int lp8788_dldo_probe(struct platform_device *pdev)
return 0;
}

static int __devexit lp8788_dldo_remove(struct platform_device *pdev)
static int lp8788_dldo_remove(struct platform_device *pdev)
{
struct lp8788_ldo *ldo = platform_get_drvdata(pdev);

Expand Down Expand Up @@ -805,7 +805,7 @@ static int lp8788_aldo_probe(struct platform_device *pdev)
return 0;
}

static int __devexit lp8788_aldo_remove(struct platform_device *pdev)
static int lp8788_aldo_remove(struct platform_device *pdev)
{
struct lp8788_ldo *ldo = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max1586.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
return ret;
}

static int __devexit max1586_pmic_remove(struct i2c_client *client)
static int max1586_pmic_remove(struct i2c_client *client)
{
struct max1586_data *max1586 = i2c_get_clientdata(client);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max77686.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ static int max77686_pmic_probe(struct platform_device *pdev)
return ret;
}

static int __devexit max77686_pmic_remove(struct platform_device *pdev)
static int max77686_pmic_remove(struct platform_device *pdev)
{
struct max77686_data *max77686 = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8649.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ static int max8649_regulator_probe(struct i2c_client *client,
return 0;
}

static int __devexit max8649_regulator_remove(struct i2c_client *client)
static int max8649_regulator_remove(struct i2c_client *client)
{
struct max8649_regulator_info *info = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8660.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ static int max8660_probe(struct i2c_client *client,
return ret;
}

static int __devexit max8660_remove(struct i2c_client *client)
static int max8660_remove(struct i2c_client *client)
{
struct max8660 *max8660 = i2c_get_clientdata(client);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8907-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ static int max8907_regulator_probe(struct platform_device *pdev)
return ret;
}

static __devexit int max8907_regulator_remove(struct platform_device *pdev)
static int max8907_regulator_remove(struct platform_device *pdev)
{
struct max8907_regulator *pmic = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8925-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ static int max8925_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit max8925_regulator_remove(struct platform_device *pdev)
static int max8925_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8952.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static int max8952_pmic_probe(struct i2c_client *client,
return 0;
}

static int __devexit max8952_pmic_remove(struct i2c_client *client)
static int max8952_pmic_remove(struct i2c_client *client)
{
struct max8952_data *max8952 = i2c_get_clientdata(client);
struct max8952_platform_data *pdata = max8952->pdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8997.c
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ static int max8997_pmic_probe(struct platform_device *pdev)
return ret;
}

static int __devexit max8997_pmic_remove(struct platform_device *pdev)
static int max8997_pmic_remove(struct platform_device *pdev)
{
struct max8997_data *max8997 = platform_get_drvdata(pdev);
struct regulator_dev **rdev = max8997->rdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/max8998.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
return ret;
}

static int __devexit max8998_pmic_remove(struct platform_device *pdev)
static int max8998_pmic_remove(struct platform_device *pdev)
{
struct max8998_data *max8998 = platform_get_drvdata(pdev);
struct regulator_dev **rdev = max8998->rdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/mc13783-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ static int mc13783_regulator_probe(struct platform_device *pdev)
return ret;
}

static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
static int mc13783_regulator_remove(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
struct mc13xxx_regulator_platform_data *pdata =
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/mc13892-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
return ret;
}

static int __devexit mc13892_regulator_remove(struct platform_device *pdev)
static int mc13892_regulator_remove(struct platform_device *pdev)
{
struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/palmas-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ static int palmas_probe(struct platform_device *pdev)
return ret;
}

static int __devexit palmas_remove(struct platform_device *pdev)
static int palmas_remove(struct platform_device *pdev)
{
struct palmas_pmic *pmic = platform_get_drvdata(pdev);
int id;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/pcap-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ static int pcap_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit pcap_regulator_remove(struct platform_device *pdev)
static int pcap_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/pcf50633-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int pcf50633_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit pcf50633_regulator_remove(struct platform_device *pdev)
static int pcf50633_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/rc5t583-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static int rc5t583_regulator_probe(struct platform_device *pdev)
return ret;
}

static int __devexit rc5t583_regulator_remove(struct platform_device *pdev)
static int rc5t583_regulator_remove(struct platform_device *pdev)
{
struct rc5t583_regulator *regs = platform_get_drvdata(pdev);
int id;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/s2mps11.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
return ret;
}

static int __devexit s2mps11_pmic_remove(struct platform_device *pdev)
static int s2mps11_pmic_remove(struct platform_device *pdev)
{
struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/s5m8767.c
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
return ret;
}

static int __devexit s5m8767_pmic_remove(struct platform_device *pdev)
static int s5m8767_pmic_remove(struct platform_device *pdev)
{
struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev);
struct regulator_dev **rdev = s5m8767->rdev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/tps51632-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ static int tps51632_probe(struct i2c_client *client,
return 0;
}

static int __devexit tps51632_remove(struct i2c_client *client)
static int tps51632_remove(struct i2c_client *client)
{
struct tps51632_chip *tps = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/tps6105x-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
return 0;
}

static int __devexit tps6105x_regulator_remove(struct platform_device *pdev)
static int tps6105x_regulator_remove(struct platform_device *pdev)
{
struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
regulator_unregister(tps6105x->regulator);
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/tps62360-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ static int tps62360_probe(struct i2c_client *client,
*
* Unregister TPS driver as an i2c client device driver
*/
static int __devexit tps62360_remove(struct i2c_client *client)
static int tps62360_remove(struct i2c_client *client)
{
struct tps62360_chip *tps = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/tps65023-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int tps_65023_probe(struct i2c_client *client,
return error;
}

static int __devexit tps_65023_remove(struct i2c_client *client)
static int tps_65023_remove(struct i2c_client *client)
{
struct tps_pmic *tps = i2c_get_clientdata(client);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/tps6507x-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
return error;
}

static int __devexit tps6507x_pmic_remove(struct platform_device *pdev)
static int tps6507x_pmic_remove(struct platform_device *pdev)
{
struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
struct tps6507x_pmic *tps = tps6507x_dev->pmic;
Expand Down
2 changes: 1 addition & 1 deletion drivers/regulator/tps65090-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
return ret;
}

static int __devexit tps65090_regulator_remove(struct platform_device *pdev)
static int tps65090_regulator_remove(struct platform_device *pdev)
{
struct tps65090_regulator *pmic = platform_get_drvdata(pdev);
struct tps65090_regulator *ri;
Expand Down
Loading

0 comments on commit 8dc995f

Please sign in to comment.