Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 336879
b: refs/heads/master
c: 415ec69
h: refs/heads/master
i:
  336877: 4d2e727
  336875: aafb1cd
  336871: 7adf8b7
  336863: e49dd95
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent f744281 commit fc61444
Show file tree
Hide file tree
Showing 36 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c8afa6406e60aec6ff90033e5ffe41a206609296
refs/heads/master: 415ec69fb1861fc377c65cb30ddc76999891b8e1
2 changes: 1 addition & 1 deletion trunk/drivers/power/88pm860x_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ static int pm860x_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit pm860x_battery_remove(struct platform_device *pdev)
static int pm860x_battery_remove(struct platform_device *pdev)
{
struct pm860x_battery_info *info = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/88pm860x_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ static int pm860x_charger_probe(struct platform_device *pdev)
return ret;
}

static int __devexit pm860x_charger_remove(struct platform_device *pdev)
static int pm860x_charger_remove(struct platform_device *pdev)
{
struct pm860x_charger_info *info = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/ab8500_btemp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ static int ab8500_btemp_suspend(struct platform_device *pdev,
#define ab8500_btemp_resume NULL
#endif

static int __devexit ab8500_btemp_remove(struct platform_device *pdev)
static int ab8500_btemp_remove(struct platform_device *pdev)
{
struct ab8500_btemp *di = platform_get_drvdata(pdev);
int i, irq;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/ab8500_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2490,7 +2490,7 @@ static int ab8500_charger_suspend(struct platform_device *pdev,
#define ab8500_charger_resume NULL
#endif

static int __devexit ab8500_charger_remove(struct platform_device *pdev)
static int ab8500_charger_remove(struct platform_device *pdev)
{
struct ab8500_charger *di = platform_get_drvdata(pdev);
int i, irq, ret;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/ab8500_fg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2411,7 +2411,7 @@ static int ab8500_fg_suspend(struct platform_device *pdev,
#define ab8500_fg_resume NULL
#endif

static int __devexit ab8500_fg_remove(struct platform_device *pdev)
static int ab8500_fg_remove(struct platform_device *pdev)
{
int ret = 0;
struct ab8500_fg *di = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/abx500_chargalg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@ static int abx500_chargalg_suspend(struct platform_device *pdev,
#define abx500_chargalg_resume NULL
#endif

static int __devexit abx500_chargalg_remove(struct platform_device *pdev)
static int abx500_chargalg_remove(struct platform_device *pdev)
{
struct abx500_chargalg *di = platform_get_drvdata(pdev);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/power/avs/smartreflex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
return ret;
}

static int __devexit omap_sr_remove(struct platform_device *pdev)
static int omap_sr_remove(struct platform_device *pdev)
{
struct omap_sr_data *pdata = pdev->dev.platform_data;
struct omap_sr *sr_info;
Expand Down Expand Up @@ -1059,7 +1059,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)
return 0;
}

static void __devexit omap_sr_shutdown(struct platform_device *pdev)
static void omap_sr_shutdown(struct platform_device *pdev)
{
struct omap_sr_data *pdata = pdev->dev.platform_data;
struct omap_sr *sr_info;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/bq27x00_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ static int bq27000_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit bq27000_battery_remove(struct platform_device *pdev)
static int bq27000_battery_remove(struct platform_device *pdev)
{
struct bq27x00_device_info *di = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/charger-manager.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1655,7 +1655,7 @@ static int charger_manager_probe(struct platform_device *pdev)
return ret;
}

static int __devexit charger_manager_remove(struct platform_device *pdev)
static int charger_manager_remove(struct platform_device *pdev)
{
struct charger_manager *cm = platform_get_drvdata(pdev);
struct charger_desc *desc = cm->desc;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/collie_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev)
return ret;
}

static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
static void collie_bat_remove(struct ucb1x00_dev *dev)
{
free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/da9052-battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
kfree(bat);
return ret;
}
static int __devexit da9052_bat_remove(struct platform_device *pdev)
static int da9052_bat_remove(struct platform_device *pdev)
{
int i;
int irq;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/ds2780_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ static int ds2780_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit ds2780_battery_remove(struct platform_device *pdev)
static int ds2780_battery_remove(struct platform_device *pdev)
{
struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/ds2781_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ static int ds2781_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit ds2781_battery_remove(struct platform_device *pdev)
static int ds2781_battery_remove(struct platform_device *pdev)
{
struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/generic-adc-battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ static int gab_probe(struct platform_device *pdev)
return ret;
}

static int __devexit gab_remove(struct platform_device *pdev)
static int gab_remove(struct platform_device *pdev)
{
int chan;
struct gab *adc_bat = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/gpio-charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static int gpio_charger_probe(struct platform_device *pdev)
return ret;
}

static int __devexit gpio_charger_remove(struct platform_device *pdev)
static int gpio_charger_remove(struct platform_device *pdev)
{
struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/intel_mid_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ static int platform_pmic_battery_probe(struct platform_device *pdev)
* pmic_battery_probe.
*/

static int __devexit platform_pmic_battery_remove(struct platform_device *pdev)
static int platform_pmic_battery_remove(struct platform_device *pdev)
{
struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/isp1704_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ static int isp1704_charger_probe(struct platform_device *pdev)
return ret;
}

static int __devexit isp1704_charger_remove(struct platform_device *pdev)
static int isp1704_charger_remove(struct platform_device *pdev)
{
struct isp1704_charger *isp = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/jz4740-battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ static int jz_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit jz_battery_remove(struct platform_device *pdev)
static int jz_battery_remove(struct platform_device *pdev)
{
struct jz_battery *jz_battery = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/lp8727_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
return 0;
}

static int __devexit lp8727_remove(struct i2c_client *cl)
static int lp8727_remove(struct i2c_client *cl)
{
struct lp8727_chg *pchg = i2c_get_clientdata(cl);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/lp8788-charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ static int lp8788_charger_probe(struct platform_device *pdev)
return 0;
}

static int __devexit lp8788_charger_remove(struct platform_device *pdev)
static int lp8788_charger_remove(struct platform_device *pdev)
{
struct lp8788_charger *pchg = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/max17040_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ static int max17040_probe(struct i2c_client *client,
return 0;
}

static int __devexit max17040_remove(struct i2c_client *client)
static int max17040_remove(struct i2c_client *client)
{
struct max17040_chip *chip = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/max17042_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ static int max17042_probe(struct i2c_client *client,
return 0;
}

static int __devexit max17042_remove(struct i2c_client *client)
static int max17042_remove(struct i2c_client *client)
{
struct max17042_chip *chip = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/max8903_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ static int max8903_probe(struct platform_device *pdev)
return ret;
}

static __devexit int max8903_remove(struct platform_device *pdev)
static int max8903_remove(struct platform_device *pdev)
{
struct max8903_data *data = platform_get_drvdata(pdev);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/power/max8925_power.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ static int max8925_init_charger(struct max8925_chip *chip,
return 0;
}

static __devexit int max8925_deinit_charger(struct max8925_power_info *info)
static int max8925_deinit_charger(struct max8925_power_info *info)
{
struct max8925_chip *chip = info->chip;
int irq;
Expand Down Expand Up @@ -501,7 +501,7 @@ static int max8925_power_probe(struct platform_device *pdev)
return ret;
}

static __devexit int max8925_power_remove(struct platform_device *pdev)
static int max8925_power_remove(struct platform_device *pdev)
{
struct max8925_power_info *info = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/max8997_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static int max8997_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit max8997_battery_remove(struct platform_device *pdev)
static int max8997_battery_remove(struct platform_device *pdev)
{
struct charger_data *charger = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/max8998_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int max8998_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit max8998_battery_remove(struct platform_device *pdev)
static int max8998_battery_remove(struct platform_device *pdev)
{
struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/olpc_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ static int olpc_battery_probe(struct platform_device *pdev)
return ret;
}

static int __devexit olpc_battery_remove(struct platform_device *pdev)
static int olpc_battery_remove(struct platform_device *pdev)
{
device_remove_file(olpc_bat.dev, &olpc_bat_error);
device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/pcf50633-charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
return 0;
}

static int __devexit pcf50633_mbc_remove(struct platform_device *pdev)
static int pcf50633_mbc_remove(struct platform_device *pdev)
{
struct pcf50633_mbc *mbc = platform_get_drvdata(pdev);
int i;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/sbs-battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ static int sbs_probe(struct i2c_client *client,
return rc;
}

static int __devexit sbs_remove(struct i2c_client *client)
static int sbs_remove(struct i2c_client *client)
{
struct sbs_info *chip = i2c_get_clientdata(client);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/tosa_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ static int tosa_bat_probe(struct platform_device *dev)
return ret;
}

static int __devexit tosa_bat_remove(struct platform_device *dev)
static int tosa_bat_remove(struct platform_device *dev)
{
free_irq(gpio_to_irq(TOSA_GPIO_JACKET_DETECT), &tosa_bat_jacket);
free_irq(gpio_to_irq(TOSA_GPIO_BAT1_CRG), &tosa_bat_jacket);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/wm831x_backup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static int wm831x_backup_probe(struct platform_device *pdev)
return ret;
}

static __devexit int wm831x_backup_remove(struct platform_device *pdev)
static int wm831x_backup_remove(struct platform_device *pdev)
{
struct wm831x_backup *devdata = platform_get_drvdata(pdev);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/wm831x_power.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ static int wm831x_power_probe(struct platform_device *pdev)
return ret;
}

static __devexit int wm831x_power_remove(struct platform_device *pdev)
static int wm831x_power_remove(struct platform_device *pdev)
{
struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
struct wm831x *wm831x = wm831x_power->wm831x;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/wm8350_power.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ static int wm8350_power_probe(struct platform_device *pdev)
return ret;
}

static __devexit int wm8350_power_remove(struct platform_device *pdev)
static int wm8350_power_remove(struct platform_device *pdev)
{
struct wm8350 *wm8350 = platform_get_drvdata(pdev);
struct wm8350_power *power = &wm8350->power;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/wm97xx_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static int wm97xx_bat_probe(struct platform_device *dev)
return ret;
}

static int __devexit wm97xx_bat_remove(struct platform_device *dev)
static int wm97xx_bat_remove(struct platform_device *dev)
{
struct wm97xx_pdata *wmdata = dev->dev.platform_data;
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/power/z2_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ static int z2_batt_probe(struct i2c_client *client,
return ret;
}

static int __devexit z2_batt_remove(struct i2c_client *client)
static int z2_batt_remove(struct i2c_client *client)
{
struct z2_charger *charger = i2c_get_clientdata(client);
struct z2_battery_info *info = charger->info;
Expand Down

0 comments on commit fc61444

Please sign in to comment.