Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / power / wm97xx_battery.c

diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index e128a813dc24c33ea54f476c618cdf9218fa0431..58f7348e6c2214f7bb63de92c2f6bede1995a547 100644 (file)
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -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);