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

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 <anton.vorontsov@linaro.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index b5a3ccb16a14..665cdc76c265 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -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",
         },