aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/max8925_power.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:26:07 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 11:43:22 -0800
commit415ec69fb1861fc377c65cb30ddc76999891b8e1 (patch)
tree52de96edeeebe3c0ec6a11bf1938da27567a7622 /drivers/power/max8925_power.c
parentpower: remove use of __devinit (diff)
downloadlinux-dev-415ec69fb1861fc377c65cb30ddc76999891b8e1.tar.xz
linux-dev-415ec69fb1861fc377c65cb30ddc76999891b8e1.zip
power: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Anton Vorontsov <cbou@mail.ru> Cc: David Woodhouse <dwmw2@infradead.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power/max8925_power.c')
-rw-r--r--drivers/power/max8925_power.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index 7b8191b08a46..1a075f1f1b67 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -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;
@@ -501,7 +501,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);