36 files changed, 37 insertions, 37 deletions

diff --git a/drivers/power/88pm860x_battery.c b/drivers/power/88pm860x_battery.c
index beed5ecf75e1..ebf7bb5c57ed 100644
--- a/drivers/power/88pm860x_battery.c
+++ b/drivers/power/88pm860x_battery.c
@@ -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);
 
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index 2dbeb1460901..fc051732e5dc 100644
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -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);
 
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index e3b6395b20dd..61867095d440 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -1101,7 +1101,7 @@ free_device_info:
 
 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 = {
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 26ff759e2220..fe36df2680a3 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2765,7 +2765,7 @@ free_device_info:
 
 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 = {
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 2db8cc254399..ff2f09c0c128 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2614,7 +2614,7 @@ free_device_info:
 
 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 = {
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 4d302803ffcc..6ed6b88f1fa8 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -1893,7 +1893,7 @@ free_device_info:
 
 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 = {
diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index 24768a27e1d8..c7d441710423 100644
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -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",
         },
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 5860d4dfbe9c..8faeb40cf78f 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -983,7 +983,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,
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 8a0aca6364c7..5a1cc0a88483 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -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,
 };
 
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index b19bfe400f8c..cd9ef5103d07 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -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,
 };
diff --git a/drivers/power/da9052-battery.c b/drivers/power/da9052-battery.c
index d9d034d7496f..753d4ba483f7 100644
--- a/drivers/power/da9052-battery.c
+++ b/drivers/power/da9052-battery.c
@@ -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,
diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c
index 74fad941c56c..2154822e9c86 100644
--- a/drivers/power/ds2780_battery.c
+++ b/drivers/power/ds2780_battery.c
@@ -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);
diff --git a/drivers/power/ds2781_battery.c b/drivers/power/ds2781_battery.c
index 22b3c8c93552..ce1200914b89 100644
--- a/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@ -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);
 
diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
index 9bdf44470396..60a0f29a9ac9 100644
--- a/drivers/power/generic-adc-battery.c
+++ b/drivers/power/generic-adc-battery.c
@@ -413,7 +413,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);
 
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index cb2aa3195687..e74fb2fbdb2c 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -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,
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index d09649706bd3..8ba1c67af60e 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -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);
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 122911978da2..1f0c5857130b 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -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);
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index ffbed5e5b945..c9abfef66aa1 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -431,7 +431,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,
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index c628224b7f58..c6ba2ff215de 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -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);
diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c
index e852d12cd077..5d743b75f5cf 100644
--- a/drivers/power/lp8788-charger.c
+++ b/drivers/power/lp8788-charger.c
@@ -781,7 +781,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,
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c
index 58e67830143c..fcc712e8aaeb 100644
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -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,
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 74abc6c755b4..0896fec2eecc 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -851,7 +851,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);
diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 3e23f43e98af..53ab51e8c892 100644
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -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,
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index daa333bd7ebb..872806018d58 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -517,7 +517,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",
         },
diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index 6e88c5d026b9..19cfd2d12901 100644
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -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,
 };
 
diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index 6dc01c255592..1db13638ef7f 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -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,
 };
 
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index a89a41acf9c5..31479115db73 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -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,
 };
 
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 3d1e9efb6f53..81bada0a3692 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -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);
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index 4146596d254b..de57fdd75a8c 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -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,
diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index a9707c11fbed..acf84e80fe98 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -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,
 };
 
diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c
index 51199b5ce221..9625a765d566 100644
--- a/drivers/power/tosa_battery.c
+++ b/drivers/power/tosa_battery.c
@@ -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,
 };
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c
index 6243e6975126..6ea6fbd32c20 100644
--- a/drivers/power/wm831x_backup.c
+++ b/drivers/power/wm831x_backup.c
@@ -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",
         },
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index fc1ad9551182..6b6a678c7c81 100644
--- a/drivers/power/wm831x_power.c
+++ b/drivers/power/wm831x_power.c
@@ -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",
         },
diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c
index fae04d384657..50d5605f4fd2 100644
--- a/drivers/power/wm8350_power.c
+++ b/drivers/power/wm8350_power.c
@@ -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",
         },
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index e128a813dc24..786d1cd685c3 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -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);
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index 5757d0d6782f..406dbd3d6bff 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -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);