A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Browse source 
The merge is merely to fix conflicts before sending a pull request.

Conflicts:
	drivers/power/ab8500_btemp.c
	drivers/power/ab8500_charger.c
	drivers/power/ab8500_fg.c
	drivers/power/abx500_chargalg.c
	drivers/power/max8925_power.c

Signed-off-by: Anton Vorontsov <[email protected]>
This commit is contained in:
Anton Vorontsov 2012-12-11 22:15:57 -08:00
commit 76d8a23b12
3228 changed files with 96115 additions and 116943 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/power/88pm860x_battery.c
View file

@ -901,7 +901,7 @@ static enum power_supply_property pm860x_batt_props[] = {
POWER_SUPPLY_PROP_TEMP,
};
static __devinit int pm860x_battery_probe(struct platform_device *pdev)
static int pm860x_battery_probe(struct platform_device *pdev)
{
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm860x_battery_info *info;
@ -989,7 +989,7 @@ out:
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);
@ -1033,7 +1033,7 @@ static struct platform_driver pm860x_battery_driver = {
.pm = &pm860x_battery_pm_ops,
},
.probe = pm860x_battery_probe,
.remove = __devexit_p(pm860x_battery_remove),
.remove = pm860x_battery_remove,
};
module_platform_driver(pm860x_battery_driver);

6
drivers/power/88pm860x_charger.c
View file

@ -645,7 +645,7 @@ static struct pm860x_irq_desc {
{ "vchg", pm860x_vchg_handler },
};
static __devinit int pm860x_charger_probe(struct platform_device *pdev)
static int pm860x_charger_probe(struct platform_device *pdev)
{
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm860x_charger_info *info;
@ -718,7 +718,7 @@ out:
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;
@ -738,7 +738,7 @@ static struct platform_driver pm860x_charger_driver = {
.owner = THIS_MODULE,
},
.probe = pm860x_charger_probe,
.remove = __devexit_p(pm860x_charger_remove),
.remove = pm860x_charger_remove,
};
module_platform_driver(pm860x_charger_driver);

6
drivers/power/ab8500_btemp.c
View file

@ -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;
@ -964,7 +964,7 @@ static char *supply_interface[] = {
"ab8500_fg",
};
static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
static int ab8500_btemp_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct ab8500_btemp *di;
@ -1103,7 +1103,7 @@ static const struct of_device_id ab8500_btemp_match[] = {
static struct platform_driver ab8500_btemp_driver = {
.probe = ab8500_btemp_probe,
.remove = __devexit_p(ab8500_btemp_remove),
.remove = ab8500_btemp_remove,
.suspend = ab8500_btemp_suspend,
.resume = ab8500_btemp_resume,
.driver = {

6
drivers/power/ab8500_charger.c
View file

@ -2492,7 +2492,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;
@ -2538,7 +2538,7 @@ static char *supply_interface[] = {
"ab8500_btemp",
};
static int __devinit ab8500_charger_probe(struct platform_device *pdev)
static int ab8500_charger_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct ab8500_charger *di;
@ -2772,7 +2772,7 @@ static const struct of_device_id ab8500_charger_match[] = {
static struct platform_driver ab8500_charger_driver = {
.probe = ab8500_charger_probe,
.remove = __devexit_p(ab8500_charger_remove),
.remove = ab8500_charger_remove,
.suspend = ab8500_charger_suspend,
.resume = ab8500_charger_resume,
.driver = {

6
drivers/power/ab8500_fg.c
View file

@ -2410,7 +2410,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);
@ -2445,7 +2445,7 @@ static char *supply_interface[] = {
"ab8500_usb",
};
static int __devinit ab8500_fg_probe(struct platform_device *pdev)
static int ab8500_fg_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct ab8500_fg *di;
@ -2615,7 +2615,7 @@ static const struct of_device_id ab8500_fg_match[] = {
static struct platform_driver ab8500_fg_driver = {
.probe = ab8500_fg_probe,
.remove = __devexit_p(ab8500_fg_remove),
.remove = ab8500_fg_remove,
.suspend = ab8500_fg_suspend,
.resume = ab8500_fg_resume,
.driver = {

6
drivers/power/abx500_chargalg.c
View file

@ -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);
@ -1803,7 +1803,7 @@ static char *supply_interface[] = {
"ab8500_fg",
};
static int __devinit abx500_chargalg_probe(struct platform_device *pdev)
static int abx500_chargalg_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct abx500_chargalg *di;
@ -1912,7 +1912,7 @@ static const struct of_device_id ab8500_chargalg_match[] = {
static struct platform_driver abx500_chargalg_driver = {
.probe = abx500_chargalg_probe,
.remove = __devexit_p(abx500_chargalg_remove),
.remove = abx500_chargalg_remove,
.suspend = abx500_chargalg_suspend,
.resume = abx500_chargalg_resume,
.driver = {

8
drivers/power/avs/smartreflex.c
View file

@ -1026,7 +1026,7 @@ err_free_devinfo:
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;
@ -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;
@ -1083,8 +1083,8 @@ static void __devexit omap_sr_shutdown(struct platform_device *pdev)
}
static struct platform_driver smartreflex_driver = {
.remove = __devexit_p(omap_sr_remove),
.shutdown = __devexit_p(omap_sr_shutdown),
.remove = omap_sr_remove,
.shutdown = omap_sr_shutdown,
.driver = {
.name = "smartreflex",
},

6
drivers/power/bq27x00_battery.c
View file

@ -934,7 +934,7 @@ static int bq27000_read_platform(struct bq27x00_device_info *di, u8 reg,
return pdata->read(dev, reg);
}
static int __devinit bq27000_battery_probe(struct platform_device *pdev)
static int bq27000_battery_probe(struct platform_device *pdev)
{
struct bq27x00_device_info *di;
struct bq27000_platform_data *pdata = pdev->dev.platform_data;
@ -977,7 +977,7 @@ err_free:
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);
@ -991,7 +991,7 @@ static int __devexit bq27000_battery_remove(struct platform_device *pdev)
static struct platform_driver bq27000_battery_driver = {
.probe = bq27000_battery_probe,
.remove = __devexit_p(bq27000_battery_remove),
.remove = bq27000_battery_remove,
.driver = {
.name = "bq27000-battery",
.owner = THIS_MODULE,

4
drivers/power/charger-manager.c
View file

@ -1655,7 +1655,7 @@ err_alloc:
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;
@ -1812,7 +1812,7 @@ static struct platform_driver charger_manager_driver = {
.pm = &charger_manager_pm,
},
.probe = charger_manager_probe,
.remove = __devexit_p(charger_manager_remove),
.remove = charger_manager_remove,
.id_table = charger_manager_id,
};

6
drivers/power/collie_battery.c
View file

@ -305,7 +305,7 @@ static int collie_bat_resume(struct ucb1x00_dev *dev)
#define collie_bat_resume NULL
#endif
static int __devinit collie_bat_probe(struct ucb1x00_dev *dev)
static int collie_bat_probe(struct ucb1x00_dev *dev)
{
int ret;
@ -349,7 +349,7 @@ err_psy_reg_main:
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);
@ -367,7 +367,7 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
static struct ucb1x00_driver collie_bat_driver = {
.add = collie_bat_probe,
.remove = __devexit_p(collie_bat_remove),
.remove = collie_bat_remove,
.suspend = collie_bat_suspend,
.resume = collie_bat_resume,
};

6
drivers/power/da9052-battery.c
View file

@ -576,7 +576,7 @@ static const char *const da9052_bat_irqs[] = {
"CHG END",
};
static s32 __devinit da9052_bat_probe(struct platform_device *pdev)
static s32 da9052_bat_probe(struct platform_device *pdev)
{
struct da9052_pdata *pdata;
struct da9052_battery *bat;
@ -630,7 +630,7 @@ err:
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;
@ -648,7 +648,7 @@ static int __devexit da9052_bat_remove(struct platform_device *pdev)
static struct platform_driver da9052_bat_driver = {
.probe = da9052_bat_probe,
.remove = __devexit_p(da9052_bat_remove),
.remove = da9052_bat_remove,
.driver = {
.name = "da9052-bat",
.owner = THIS_MODULE,

6
drivers/power/ds2780_battery.c
View file

@ -755,7 +755,7 @@ static const struct attribute_group ds2780_attr_group = {
.attrs = ds2780_attributes,
};
static int __devinit ds2780_battery_probe(struct platform_device *pdev)
static int ds2780_battery_probe(struct platform_device *pdev)
{
int ret = 0;
struct ds2780_device_info *dev_info;
@ -819,7 +819,7 @@ fail:
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);
@ -837,7 +837,7 @@ static struct platform_driver ds2780_battery_driver = {
.name = "ds2780-battery",
},
.probe = ds2780_battery_probe,
.remove = __devexit_p(ds2780_battery_remove),
.remove = ds2780_battery_remove,
};
module_platform_driver(ds2780_battery_driver);

6
drivers/power/ds2781_battery.c
View file

@ -750,7 +750,7 @@ static const struct attribute_group ds2781_attr_group = {
.attrs = ds2781_attributes,
};
static int __devinit ds2781_battery_probe(struct platform_device *pdev)
static int ds2781_battery_probe(struct platform_device *pdev)
{
int ret = 0;
struct ds2781_device_info *dev_info;
@ -810,7 +810,7 @@ fail:
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);
@ -827,7 +827,7 @@ static struct platform_driver ds2781_battery_driver = {
.name = "ds2781-battery",
},
.probe = ds2781_battery_probe,
.remove = __devexit_p(ds2781_battery_remove),
.remove = ds2781_battery_remove,
};
module_platform_driver(ds2781_battery_driver);

6
drivers/power/generic-adc-battery.c
View file

@ -236,7 +236,7 @@ static irqreturn_t gab_charged(int irq, void *dev_id)
return IRQ_HANDLED;
}
static int __devinit gab_probe(struct platform_device *pdev)
static int gab_probe(struct platform_device *pdev)
{
struct gab *adc_bat;
struct power_supply *psy;
@ -352,7 +352,7 @@ first_mem_fail:
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);
@ -414,7 +414,7 @@ static struct platform_driver gab_driver = {
.pm = GAB_PM_OPS
},
.probe = gab_probe,
.remove = __devexit_p(gab_remove),
.remove = gab_remove,
};
module_platform_driver(gab_driver);

6
drivers/power/gpio-charger.c
View file

@ -68,7 +68,7 @@ static enum power_supply_property gpio_charger_properties[] = {
POWER_SUPPLY_PROP_ONLINE,
};
static int __devinit gpio_charger_probe(struct platform_device *pdev)
static int gpio_charger_probe(struct platform_device *pdev)
{
const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data;
struct gpio_charger *gpio_charger;
@ -144,7 +144,7 @@ err_free:
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);
@ -177,7 +177,7 @@ static SIMPLE_DEV_PM_OPS(gpio_charger_pm_ops, NULL, gpio_charger_resume);
static struct platform_driver gpio_charger_driver = {
.probe = gpio_charger_probe,
.remove = __devexit_p(gpio_charger_remove),
.remove = gpio_charger_remove,
.driver = {
.name = "gpio-charger",
.owner = THIS_MODULE,

8
drivers/power/intel_mid_battery.c
View file

@ -649,7 +649,7 @@ static void pmic_battery_handle_intrpt(struct work_struct *work)
* PMIC battery initializes its internal data structue and other
* infrastructure components for it to work as expected.
*/
static __devinit int probe(int irq, struct device *dev)
static int probe(int irq, struct device *dev)
{
int retval = 0;
struct pmic_power_module_info *pbi;
@ -739,7 +739,7 @@ wqueue_failed:
return retval;
}
static int __devinit platform_pmic_battery_probe(struct platform_device *pdev)
static int platform_pmic_battery_probe(struct platform_device *pdev)
{
return probe(pdev->id, &pdev->dev);
}
@ -754,7 +754,7 @@ static int __devinit 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);
@ -776,7 +776,7 @@ static struct platform_driver platform_pmic_battery_driver = {
.owner = THIS_MODULE,
},
.probe = platform_pmic_battery_probe,
.remove = __devexit_p(platform_pmic_battery_remove),
.remove = platform_pmic_battery_remove,
};
module_platform_driver(platform_pmic_battery_driver);

6
drivers/power/isp1704_charger.c
View file

@ -406,7 +406,7 @@ static inline int isp1704_test_ulpi(struct isp1704_charger *isp)
return -ENODEV;
}
static int __devinit isp1704_charger_probe(struct platform_device *pdev)
static int isp1704_charger_probe(struct platform_device *pdev)
{
struct isp1704_charger *isp;
int ret = -ENODEV;
@ -484,7 +484,7 @@ fail0:
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);
@ -502,7 +502,7 @@ static struct platform_driver isp1704_charger_driver = {
.name = "isp1704_charger",
},
.probe = isp1704_charger_probe,
.remove = __devexit_p(isp1704_charger_remove),
.remove = isp1704_charger_remove,
};
module_platform_driver(isp1704_charger_driver);

6
drivers/power/jz4740-battery.c
View file

@ -237,7 +237,7 @@ static void jz_battery_work(struct work_struct *work)
schedule_delayed_work(&jz_battery->work, interval);
}
static int __devinit jz_battery_probe(struct platform_device *pdev)
static int jz_battery_probe(struct platform_device *pdev)
{
int ret = 0;
struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data;
@ -353,7 +353,7 @@ err:
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);
@ -404,7 +404,7 @@ static const struct dev_pm_ops jz_battery_pm_ops = {
static struct platform_driver jz_battery_driver = {
.probe = jz_battery_probe,
.remove = __devexit_p(jz_battery_remove),
.remove = jz_battery_remove,
.driver = {
.name = "jz4740-battery",
.owner = THIS_MODULE,

4
drivers/power/lp8727_charger.c
View file

@ -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);
@ -542,7 +542,7 @@ static struct i2c_driver lp8727_driver = {
.name = "lp8727",
},
.probe = lp8727_probe,
.remove = __devexit_p(lp8727_remove),
.remove = lp8727_remove,
.id_table = lp8727_ids,
};
module_i2c_driver(lp8727_driver);

6
drivers/power/lp8788-charger.c
View file

@ -686,7 +686,7 @@ static const struct attribute_group lp8788_attr_group = {
.attrs = lp8788_charger_attr,
};
static __devinit int lp8788_charger_probe(struct platform_device *pdev)
static int lp8788_charger_probe(struct platform_device *pdev)
{
struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
struct lp8788_charger *pchg;
@ -723,7 +723,7 @@ static __devinit 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);
@ -738,7 +738,7 @@ static int __devexit lp8788_charger_remove(struct platform_device *pdev)
static struct platform_driver lp8788_charger_driver = {
.probe = lp8788_charger_probe,
.remove = __devexit_p(lp8788_charger_remove),
.remove = lp8788_charger_remove,
.driver = {
.name = LP8788_DEV_CHARGER,
.owner = THIS_MODULE,

6
drivers/power/max17040_battery.c
View file

@ -197,7 +197,7 @@ static enum power_supply_property max17040_battery_props[] = {
POWER_SUPPLY_PROP_CAPACITY,
};
static int __devinit max17040_probe(struct i2c_client *client,
static int max17040_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@ -238,7 +238,7 @@ static int __devinit 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);
@ -285,7 +285,7 @@ static struct i2c_driver max17040_i2c_driver = {
.name = "max17040",
},
.probe = max17040_probe,
.remove = __devexit_p(max17040_remove),
.remove = max17040_remove,
.suspend = max17040_suspend,
.resume = max17040_resume,
.id_table = max17040_id,

6
drivers/power/max17042_battery.c
View file

@ -682,7 +682,7 @@ max17042_get_pdata(struct device *dev)
}
#endif
static int __devinit max17042_probe(struct i2c_client *client,
static int max17042_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@ -776,7 +776,7 @@ static int __devinit 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);
@ -852,7 +852,7 @@ static struct i2c_driver max17042_i2c_driver = {
.pm = MAX17042_PM_OPS,
},
.probe = max17042_probe,
.remove = __devexit_p(max17042_remove),
.remove = max17042_remove,
.id_table = max17042_id,
};
module_i2c_driver(max17042_i2c_driver);

6
drivers/power/max8903_charger.c
View file

@ -179,7 +179,7 @@ static irqreturn_t max8903_fault(int irq, void *_data)
return IRQ_HANDLED;
}
static __devinit int max8903_probe(struct platform_device *pdev)
static int max8903_probe(struct platform_device *pdev)
{
struct max8903_data *data;
struct device *dev = &pdev->dev;
@ -345,7 +345,7 @@ err:
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);
@ -367,7 +367,7 @@ static __devexit int max8903_remove(struct platform_device *pdev)
static struct platform_driver max8903_driver = {
.probe = max8903_probe,
.remove = __devexit_p(max8903_remove),
.remove = max8903_remove,
.driver = {
.name = "max8903-charger",
.owner = THIS_MODULE,

10
drivers/power/max8925_power.c
View file

@ -357,7 +357,7 @@ do { \
_irq, ret); \
} while (0)
static __devinit int max8925_init_charger(struct max8925_chip *chip,
static int max8925_init_charger(struct max8925_chip *chip,
struct max8925_power_info *info)
{
int ret;
@ -415,7 +415,7 @@ static __devinit 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;
@ -475,7 +475,7 @@ max8925_power_dt_init(struct platform_device *pdev)
}
#endif
static __devinit int max8925_power_probe(struct platform_device *pdev)
static int max8925_power_probe(struct platform_device *pdev)
{
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct max8925_power_pdata *pdata = NULL;
@ -550,7 +550,7 @@ out:
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);
@ -566,7 +566,7 @@ static __devexit int max8925_power_remove(struct platform_device *pdev)
static struct platform_driver max8925_power_driver = {
.probe = max8925_power_probe,
.remove = __devexit_p(max8925_power_remove),
.remove = max8925_power_remove,
.driver = {
.name = "max8925-power",
},

6
drivers/power/max8997_charger.c
View file

@ -86,7 +86,7 @@ static int max8997_battery_get_property(struct power_supply *psy,
return 0;
}
static __devinit int max8997_battery_probe(struct platform_device *pdev)
static int max8997_battery_probe(struct platform_device *pdev)
{
int ret = 0;
struct charger_data *charger;
@ -167,7 +167,7 @@ err:
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);
@ -187,7 +187,7 @@ static struct platform_driver max8997_battery_driver = {
.owner = THIS_MODULE,
},
.probe = max8997_battery_probe,
.remove = __devexit_p(max8997_battery_remove),
.remove = max8997_battery_remove,
.id_table = max8997_battery_id,
};

6
drivers/power/max8998_charger.c
View file

@ -75,7 +75,7 @@ static int max8998_battery_get_property(struct power_supply *psy,
return 0;
}
static __devinit int max8998_battery_probe(struct platform_device *pdev)
static int max8998_battery_probe(struct platform_device *pdev)
{
struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max8998_platform_data *pdata = dev_get_platdata(iodev->dev);
@ -178,7 +178,7 @@ err:
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);
@ -199,7 +199,7 @@ static struct platform_driver max8998_battery_driver = {
.owner = THIS_MODULE,
},
.probe = max8998_battery_probe,
.remove = __devexit_p(max8998_battery_remove),
.remove = max8998_battery_remove,
.id_table = max8998_battery_id,
};

6
drivers/power/olpc_battery.c
View file

@ -598,7 +598,7 @@ static int olpc_battery_suspend(struct platform_device *pdev,
return 0;
}
static int __devinit olpc_battery_probe(struct platform_device *pdev)
static int olpc_battery_probe(struct platform_device *pdev)
{
int ret;
uint8_t status;
@ -659,7 +659,7 @@ battery_failed:
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);
@ -681,7 +681,7 @@ static struct platform_driver olpc_battery_driver = {
.of_match_table = olpc_battery_ids,
},
.probe = olpc_battery_probe,
.remove = __devexit_p(olpc_battery_remove),
.remove = olpc_battery_remove,
.suspend = olpc_battery_suspend,
};

6
drivers/power/pcf50633-charger.c
View file

@ -366,7 +366,7 @@ static const u8 mbc_irq_handlers[] = {
PCF50633_IRQ_LOWBAT,
};
static int __devinit pcf50633_mbc_probe(struct platform_device *pdev)
static int pcf50633_mbc_probe(struct platform_device *pdev)
{
struct pcf50633_mbc *mbc;
int ret;
@ -447,7 +447,7 @@ static int __devinit 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;
@ -471,7 +471,7 @@ static struct platform_driver pcf50633_mbc_driver = {
.name = "pcf50633-mbc",
},
.probe = pcf50633_mbc_probe,
.remove = __devexit_p(pcf50633_mbc_remove),
.remove = pcf50633_mbc_remove,
};
module_platform_driver(pcf50633_mbc_driver);

2
drivers/power/s3c_adc_battery.c
View file

@ -286,7 +286,7 @@ static irqreturn_t s3c_adc_bat_charged(int irq, void *dev_id)
return IRQ_HANDLED;
}
static int __devinit s3c_adc_bat_probe(struct platform_device *pdev)
static int s3c_adc_bat_probe(struct platform_device *pdev)
{
struct s3c_adc_client *client;
struct s3c_adc_bat_pdata *pdata = pdev->dev.platform_data;

6
drivers/power/sbs-battery.c
View file

@ -675,7 +675,7 @@ static struct sbs_platform_data *sbs_of_populate_pdata(
}
#endif
static int __devinit sbs_probe(struct i2c_client *client,
static int sbs_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct sbs_info *chip;
@ -800,7 +800,7 @@ exit_free_name:
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);
@ -853,7 +853,7 @@ MODULE_DEVICE_TABLE(i2c, sbs_id);
static struct i2c_driver sbs_battery_driver = {
.probe = sbs_probe,
.remove = __devexit_p(sbs_remove),
.remove = sbs_remove,
.suspend = sbs_suspend,
.resume = sbs_resume,
.id_table = sbs_id,

2
drivers/power/smb347-charger.c
View file

@ -1313,7 +1313,7 @@ static struct i2c_driver smb347_driver = {
.name = "smb347",
},
.probe = smb347_probe,
.remove = __devexit_p(smb347_remove),
.remove = smb347_remove,
.id_table = smb347_id,
};

6
drivers/power/tosa_battery.c
View file

@ -342,7 +342,7 @@ static int tosa_bat_resume(struct platform_device *dev)
#define tosa_bat_resume NULL
#endif
static int __devinit tosa_bat_probe(struct platform_device *dev)
static int tosa_bat_probe(struct platform_device *dev)
{
int ret;
@ -409,7 +409,7 @@ err_psy_reg_main:
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);
@ -433,7 +433,7 @@ static struct platform_driver tosa_bat_driver = {
.driver.name = "wm97xx-battery",
.driver.owner = THIS_MODULE,
.probe = tosa_bat_probe,
.remove = __devexit_p(tosa_bat_remove),
.remove = tosa_bat_remove,
.suspend = tosa_bat_suspend,
.resume = tosa_bat_resume,
};

6
drivers/power/wm831x_backup.c
View file

@ -161,7 +161,7 @@ static enum power_supply_property wm831x_backup_props[] = {
* Initialisation
*********************************************************************/
static __devinit int wm831x_backup_probe(struct platform_device *pdev)
static int wm831x_backup_probe(struct platform_device *pdev)
{
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
@ -207,7 +207,7 @@ err_kmalloc:
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);
@ -220,7 +220,7 @@ static __devexit int wm831x_backup_remove(struct platform_device *pdev)
static struct platform_driver wm831x_backup_driver = {
.probe = wm831x_backup_probe,
.remove = __devexit_p(wm831x_backup_remove),
.remove = wm831x_backup_remove,
.driver = {
.name = "wm831x-backup",
},

6
drivers/power/wm831x_power.c
View file

@ -489,7 +489,7 @@ static irqreturn_t wm831x_pwr_src_irq(int irq, void *data)
return IRQ_HANDLED;
}
static __devinit int wm831x_power_probe(struct platform_device *pdev)
static int wm831x_power_probe(struct platform_device *pdev)
{
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
@ -625,7 +625,7 @@ err_kmalloc:
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;
@ -654,7 +654,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)
static struct platform_driver wm831x_power_driver = {
.probe = wm831x_power_probe,
.remove = __devexit_p(wm831x_power_remove),
.remove = wm831x_power_remove,
.driver = {
.name = "wm831x-power",
},

6
drivers/power/wm8350_power.c
View file

@ -442,7 +442,7 @@ static void free_charger_irq(struct wm8350 *wm8350)
wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB, wm8350);
}
static __devinit int wm8350_power_probe(struct platform_device *pdev)
static int wm8350_power_probe(struct platform_device *pdev)
{
struct wm8350 *wm8350 = platform_get_drvdata(pdev);
struct wm8350_power *power = &wm8350->power;
@ -501,7 +501,7 @@ battery_failed:
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;
@ -516,7 +516,7 @@ static __devexit int wm8350_power_remove(struct platform_device *pdev)
static struct platform_driver wm8350_power_driver = {
.probe = wm8350_power_probe,
.remove = __devexit_p(wm8350_power_remove),
.remove = wm8350_power_remove,
.driver = {
.name = "wm8350-power",
},

6
drivers/power/wm97xx_battery.c
View file

@ -162,7 +162,7 @@ static const struct dev_pm_ops wm97xx_bat_pm_ops = {
};
#endif
static int __devinit wm97xx_bat_probe(struct platform_device *dev)
static int wm97xx_bat_probe(struct platform_device *dev)
{
int ret = 0;
int props = 1; /* POWER_SUPPLY_PROP_PRESENT */
@ -263,7 +263,7 @@ err:
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;
@ -287,7 +287,7 @@ static struct platform_driver wm97xx_bat_driver = {
#endif
},
.probe = wm97xx_bat_probe,
.remove = __devexit_p(wm97xx_bat_remove),
.remove = wm97xx_bat_remove,
};
module_platform_driver(wm97xx_bat_driver);

6
drivers/power/z2_battery.c
View file

@ -180,7 +180,7 @@ static int z2_batt_ps_init(struct z2_charger *charger, int props)
return 0;
}
static int __devinit z2_batt_probe(struct i2c_client *client,
static int z2_batt_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int ret = 0;
@ -251,7 +251,7 @@ err:
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;
@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = {
.pm = Z2_BATTERY_PM_OPS
},
.probe = z2_batt_probe,
.remove = __devexit_p(z2_batt_remove),
.remove = z2_batt_remove,
.id_table = z2_batt_id,
};
module_i2c_driver(z2_batt_driver);