3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/power/max77660-charger-extcon.c b/drivers/power/max77660-charger-extcon.c
index b8245cc521bf..518c56deaa6a 100644
--- a/drivers/power/max77660-charger-extcon.c
+++ b/drivers/power/max77660-charger-extcon.c
@@ -594,7 +594,7 @@ out:
 	return ret;
 }
 
-static int __devinit max77660_chg_extcon_probe(struct platform_device *pdev)
+static int max77660_chg_extcon_probe(struct platform_device *pdev)
 {
 	struct max77660_chg_extcon *chg_extcon;
 	struct max77660_platform_data *pdata;
@@ -747,7 +747,7 @@ out:
 	return ret;
 }
 
-static int __devexit max77660_chg_extcon_remove(struct platform_device *pdev)
+static int max77660_chg_extcon_remove(struct platform_device *pdev)
 {
 	struct max77660_chg_extcon *chg_extcon = dev_get_drvdata(&pdev->dev);
 
@@ -817,7 +817,7 @@ static const struct dev_pm_ops max77660_pm_ops = {
 
 static struct platform_driver max77660_chg_extcon_driver = {
 	.probe = max77660_chg_extcon_probe,
-	.remove = __devexit_p(max77660_chg_extcon_remove),
+	.remove = max77660_chg_extcon_remove,
 	.driver = {
 		.name = "max77660-charger-extcon",
 		.owner = THIS_MODULE,
diff --git a/drivers/power/palmas_battery.c b/drivers/power/palmas_battery.c
index 09e7514e1cf1..584ba4985e0c 100644
--- a/drivers/power/palmas_battery.c
+++ b/drivers/power/palmas_battery.c
@@ -1483,7 +1483,7 @@ static int palmas_current_setup(struct palmas_battery_info *di,
 	return ret;
 }
 
-static __devinit int palmas_battery_probe(struct platform_device *pdev)
+static int palmas_battery_probe(struct platform_device *pdev)
 {
 	struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
 	struct palmas_platform_data *palmas_pdata;
@@ -1630,7 +1630,7 @@ err:
 	return ret;
 }
 
-static int __devexit palmas_battery_remove(struct platform_device *pdev)
+static int palmas_battery_remove(struct platform_device *pdev)
 {
 	struct palmas_battery_info *di = platform_get_drvdata(pdev);
 	struct palmas *palmas = di->palmas;
@@ -1648,7 +1648,7 @@ static int __devexit palmas_battery_remove(struct platform_device *pdev)
 
 static struct platform_driver palmas_battery_driver = {
 	.probe = palmas_battery_probe,
-	.remove = __devexit_p(palmas_battery_remove),
+	.remove = palmas_battery_remove,
 	.driver = {
 		.name = "palmas-battery-gauge",
 		.owner = THIS_MODULE,
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 1bca1517ae09..2bae19114a11 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -164,7 +164,7 @@ error:
 	return IRQ_HANDLED;
 }
 
-static __devinit int tps65090_charger_probe(struct platform_device *pdev)
+static int tps65090_charger_probe(struct platform_device *pdev)
 {
 	uint8_t retval = 0;
 	int ret;
@@ -260,7 +260,7 @@ fail_suppy_reg:
 	return ret;
 }
 
-static int __devexit tps65090_charger_remove(struct platform_device *pdev)
+static int tps65090_charger_remove(struct platform_device *pdev)
 {
 	struct tps65090_charger *charger = dev_get_drvdata(&pdev->dev);
 
@@ -275,7 +275,7 @@ static struct platform_driver tps65090_charger_driver = {
 		.owner	= THIS_MODULE,
 	},
 	.probe	= tps65090_charger_probe,
-	.remove = __devexit_p(tps65090_charger_remove),
+	.remove = tps65090_charger_remove,
 };
 
 module_platform_driver(tps65090_charger_driver);