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>

diff --git a/drivers/power/88pm860x_battery.c b/drivers/power/88pm860x_battery.c
index 0a8e09fc2138129d91615cd3fb7e48e51f00845a..8bc80b05c63c86b17ebe5a9b2c9abbc9ca8e0f9d 100644 (file)
--- a/drivers/power/88pm860x_battery.c
+++ b/drivers/power/88pm860x_battery.c
@@ -989,7 +989,7 @@ out:
        return ret;
 }
 
-static int __devexit pm860x_battery_remove(struct platform_device *pdev)
+static int pm860x_battery_remove(struct platform_device *pdev)
 {
        struct pm860x_battery_info *info = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index 5f034f2c1964e29c650b918d7493a6d0fb27a8d8..4b37a5af8deb20ee7e2cb64630376ae4284d7eb7 100644 (file)
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -718,7 +718,7 @@ out:
        return ret;
 }
 
-static int __devexit pm860x_charger_remove(struct platform_device *pdev)
+static int pm860x_charger_remove(struct platform_device *pdev)
 {
        struct pm860x_charger_info *info = platform_get_drvdata(pdev);
        int i;

diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index 87a7c972a909204f13a013831664881005173a61..989b09950affb71fefb663b5aafa5e7564f9ee2d 100644 (file)
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -938,7 +938,7 @@ static int ab8500_btemp_suspend(struct platform_device *pdev,
 #define ab8500_btemp_resume       NULL
 #endif
 
-static int __devexit ab8500_btemp_remove(struct platform_device *pdev)
+static int ab8500_btemp_remove(struct platform_device *pdev)
 {
        struct ab8500_btemp *di = platform_get_drvdata(pdev);
        int i, irq;

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index b19149b540eeaff1a198b9bf29c52a85de0d8486..7ecb8abe20b54a69189772c5ed913ede3475cf29 100644 (file)
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2490,7 +2490,7 @@ static int ab8500_charger_suspend(struct platform_device *pdev,
 #define ab8500_charger_resume       NULL
 #endif
 
-static int __devexit ab8500_charger_remove(struct platform_device *pdev)
+static int ab8500_charger_remove(struct platform_device *pdev)
 {
        struct ab8500_charger *di = platform_get_drvdata(pdev);
        int i, irq, ret;

diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index b3598b86bbe0df302ca2001a0df87d69d29a92a0..331dc43ded4e6fe319d336a5725431317e94b701 100644 (file)
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2411,7 +2411,7 @@ static int ab8500_fg_suspend(struct platform_device *pdev,
 #define ab8500_fg_resume       NULL
 #endif
 
-static int __devexit ab8500_fg_remove(struct platform_device *pdev)
+static int ab8500_fg_remove(struct platform_device *pdev)
 {
        int ret = 0;
        struct ab8500_fg *di = platform_get_drvdata(pdev);

diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 44a5fdac970f44a7370b53d5406d032236051bdf..19f25419079056b5a27260e53ce70639b0eeabdd 100644 (file)
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -1782,7 +1782,7 @@ static int abx500_chargalg_suspend(struct platform_device *pdev,
 #define abx500_chargalg_resume       NULL
 #endif
 
-static int __devexit abx500_chargalg_remove(struct platform_device *pdev)
+static int abx500_chargalg_remove(struct platform_device *pdev)
 {
        struct abx500_chargalg *di = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index c7d4417104232d864b464708f149b81ce3a796d1..d0fed2c5cf2c084ec7849170f57c47cbf1e31497 100644 (file)
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -1026,7 +1026,7 @@ err_free_devinfo:
        return ret;
 }
 
-static int __devexit omap_sr_remove(struct platform_device *pdev)
+static int omap_sr_remove(struct platform_device *pdev)
 {
        struct omap_sr_data *pdata = pdev->dev.platform_data;
        struct omap_sr *sr_info;
@@ -1059,7 +1059,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)
        return 0;
 }
 
-static void __devexit omap_sr_shutdown(struct platform_device *pdev)
+static void omap_sr_shutdown(struct platform_device *pdev)
 {
        struct omap_sr_data *pdata = pdev->dev.platform_data;
        struct omap_sr *sr_info;

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index a256a4c05dc641b1e1c26324c953a16f3abc0a70..e0edaf7de54bcb8b8823f899a74b23dccfd038f6 100644 (file)
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -969,7 +969,7 @@ err_free:
        return ret;
 }
 
-static int __devexit bq27000_battery_remove(struct platform_device *pdev)
+static int bq27000_battery_remove(struct platform_device *pdev)
 {
        struct bq27x00_device_info *di = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 5a1cc0a884834f5979f355c6430d73785ea9cae9..adb3a4b59cb3a369b569dc235eddfbd8e07dc0bc 100644 (file)
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -1655,7 +1655,7 @@ err_alloc:
        return ret;
 }
 
-static int __devexit charger_manager_remove(struct platform_device *pdev)
+static int charger_manager_remove(struct platform_device *pdev)
 {
        struct charger_manager *cm = platform_get_drvdata(pdev);
        struct charger_desc *desc = cm->desc;

diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index d3d80bb84c8f1c24ac64bd50681d509a9712c17a..c58d0e31bdef51918934aac528882513962c3fbb 100644 (file)
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -349,7 +349,7 @@ err_psy_reg_main:
        return ret;
 }
 
-static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
+static void collie_bat_remove(struct ucb1x00_dev *dev)
 {
        free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);
 

diff --git a/drivers/power/da9052-battery.c b/drivers/power/da9052-battery.c
index 133829065afb7b39f2f309fb9ff7732eea051460..bb0df8917adcc92b70ec40c77700f141e737ba2a 100644 (file)
--- a/drivers/power/da9052-battery.c
+++ b/drivers/power/da9052-battery.c
@@ -630,7 +630,7 @@ err:
        kfree(bat);
        return ret;
 }
-static int __devexit da9052_bat_remove(struct platform_device *pdev)
+static int da9052_bat_remove(struct platform_device *pdev)
 {
        int i;
        int irq;

diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c
index 42024f8542139db6ee5e28346f2dd7e006ec90af..8b6c4539e7f409cac61c885060a578467d0d1464 100644 (file)
--- a/drivers/power/ds2780_battery.c
+++ b/drivers/power/ds2780_battery.c
@@ -819,7 +819,7 @@ fail:
        return ret;
 }
 
-static int __devexit ds2780_battery_remove(struct platform_device *pdev)
+static int ds2780_battery_remove(struct platform_device *pdev)
 {
        struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/ds2781_battery.c b/drivers/power/ds2781_battery.c
index 46821aafe6beb583ae67790db18b1587a1cd6923..0a5acc6fc6f0c75aabc36c548bff7b6d640a4582 100644 (file)
--- a/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@ -810,7 +810,7 @@ fail:
        return ret;
 }
 
-static int __devexit ds2781_battery_remove(struct platform_device *pdev)
+static int ds2781_battery_remove(struct platform_device *pdev)
 {
        struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
index 055dea7a1756adc32abb440298dd7acf884f5b43..e902b088d52cf334429b287ad1b26640ffbd051a 100644 (file)
--- a/drivers/power/generic-adc-battery.c
+++ b/drivers/power/generic-adc-battery.c
@@ -351,7 +351,7 @@ first_mem_fail:
        return ret;
 }
 
-static int __devexit gab_remove(struct platform_device *pdev)
+static int gab_remove(struct platform_device *pdev)
 {
        int chan;
        struct gab *adc_bat = platform_get_drvdata(pdev);

diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index cea6e6ae0e84aa1d619a4e46be4582b3abea655a..e3e40a9f3af2a962e39a4f4687359e348bc87d11 100644 (file)
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -144,7 +144,7 @@ err_free:
        return ret;
 }
 
-static int __devexit gpio_charger_remove(struct platform_device *pdev)
+static int gpio_charger_remove(struct platform_device *pdev)
 {
        struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 0eb50b0daf742ff21ad4d20ce5c66b799109c1d7..18d136b443ee01da3ced9ce696aa3a87460e7410 100644 (file)
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -754,7 +754,7 @@ static int platform_pmic_battery_probe(struct platform_device *pdev)
  * pmic_battery_probe.
  */
 
-static int __devexit platform_pmic_battery_remove(struct platform_device *pdev)
+static int platform_pmic_battery_remove(struct platform_device *pdev)
 {
        struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);
 

diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 3a1b9598d168395e2e80ec0ea5da33d8bcf6a67c..176ad59d99f5799ce10d8b4550d614a88f1e7e8d 100644 (file)
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -484,7 +484,7 @@ fail0:
        return ret;
 }
 
-static int __devexit isp1704_charger_remove(struct platform_device *pdev)
+static int isp1704_charger_remove(struct platform_device *pdev)
 {
        struct isp1704_charger *isp = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 1f7d2ca0dbd2b55a79aa9b4925a856e1f35ed37e..74ac69e0687fdc262791cc006e27b4d4895c3b0d 100644 (file)
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -376,7 +376,7 @@ err_free:
        return ret;
 }
 
-static int __devexit jz_battery_remove(struct platform_device *pdev)
+static int jz_battery_remove(struct platform_device *pdev)
 {
        struct jz_battery *jz_battery = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index c6ba2ff215de7b8886db6bee4ad946614838f065..4ee71a90e2483f90a32cc2857a0b95833d7cffb8 100644 (file)
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -522,7 +522,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
        return 0;
 }
 
-static int __devexit lp8727_remove(struct i2c_client *cl)
+static int lp8727_remove(struct i2c_client *cl)
 {
        struct lp8727_chg *pchg = i2c_get_clientdata(cl);
 

diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c
index 3bdb4be8db2b2417d5e57176f339c5ab90e554b5..a1c51ac117fd2a7cf319449296ff7d6eb9b1428c 100644 (file)
--- a/drivers/power/lp8788-charger.c
+++ b/drivers/power/lp8788-charger.c
@@ -766,7 +766,7 @@ static int lp8788_charger_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit lp8788_charger_remove(struct platform_device *pdev)
+static int lp8788_charger_remove(struct platform_device *pdev)
 {
        struct lp8788_charger *pchg = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c
index ae10a21ed70c2cd3f3ee940dfb54df513f903534..22cfe9cc4727c161b2306edc5aa91688ee481ede 100644 (file)
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -238,7 +238,7 @@ static int max17040_probe(struct i2c_client *client,
        return 0;
 }
 
-static int __devexit max17040_remove(struct i2c_client *client)
+static int max17040_remove(struct i2c_client *client)
 {
        struct max17040_chip *chip = i2c_get_clientdata(client);
 

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 8752bc01a9ea04e393add8807401d7f5f398330d..5ffe46916f0be4a445f63a257dc0b86383177c32 100644 (file)
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -775,7 +775,7 @@ static int max17042_probe(struct i2c_client *client,
        return 0;
 }
 
-static int __devexit max17042_remove(struct i2c_client *client)
+static int max17042_remove(struct i2c_client *client)
 {
        struct max17042_chip *chip = i2c_get_clientdata(client);
 

diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 83272c51f6a53ea351db0b76897a7153aadffd63..14e2b96d93b0f8eb43cc78379804cfe818bf9049 100644 (file)
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -345,7 +345,7 @@ err:
        return ret;
 }
 
-static __devexit int max8903_remove(struct platform_device *pdev)
+static int max8903_remove(struct platform_device *pdev)
 {
        struct max8903_data *data = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index 7b8191b08a46797221763bdf2f8ad9a3a10a6259..1a075f1f1b676c9cd7c2f16666852a46cf4629f1 100644 (file)
--- 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);
 

diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index c6767dfd4c41c12d6b0bab72594e4c48e0f733a8..e757885b620c5c6cf00639fc6a5952631308041b 100644 (file)
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -167,7 +167,7 @@ err:
        return ret;
 }
 
-static int __devexit max8997_battery_remove(struct platform_device *pdev)
+static int max8997_battery_remove(struct platform_device *pdev)
 {
        struct charger_data *charger = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index 9f34c80f358cf3937203e09002355bf5a57844ec..bf677e3daec93a031a9db5f2061775dc1336c265 100644 (file)
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -178,7 +178,7 @@ err:
        return ret;
 }
 
-static int __devexit max8998_battery_remove(struct platform_device *pdev)
+static int max8998_battery_remove(struct platform_device *pdev)
 {
        struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 60d5449a9960ac9afd9e24d5e442f3f4eeef7269..298c47d111b4c53470ad08a5d6fb3db1064a5c7f 100644 (file)
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -659,7 +659,7 @@ battery_failed:
        return ret;
 }
 
-static int __devexit olpc_battery_remove(struct platform_device *pdev)
+static int olpc_battery_remove(struct platform_device *pdev)
 {
        device_remove_file(olpc_bat.dev, &olpc_bat_error);
        device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);

diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index c0ba4ecb1943114f33bdcc58be363a2a1a5cb681..c2122a7ad06577449f980f31e3f43183cfe4a0ac 100644 (file)
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -447,7 +447,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit pcf50633_mbc_remove(struct platform_device *pdev)
+static int pcf50633_mbc_remove(struct platform_device *pdev)
 {
        struct pcf50633_mbc *mbc = platform_get_drvdata(pdev);
        int i;

diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index 30280c5b1fb75f0b60936a03bb79340860086e70..3960f0b2afe97200ff8c8e95312de66b36060f0e 100644 (file)
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -800,7 +800,7 @@ exit_free_name:
        return rc;
 }
 
-static int __devexit sbs_remove(struct i2c_client *client)
+static int sbs_remove(struct i2c_client *client)
 {
        struct sbs_info *chip = i2c_get_clientdata(client);
 

diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c
index d958c9f6d52482885f72f776268729a7c3d4cf73..0224de50c54017b0d60a0f9be53d13d21c44ff1d 100644 (file)
--- a/drivers/power/tosa_battery.c
+++ b/drivers/power/tosa_battery.c
@@ -409,7 +409,7 @@ err_psy_reg_main:
        return ret;
 }
 
-static int __devexit tosa_bat_remove(struct platform_device *dev)
+static int tosa_bat_remove(struct platform_device *dev)
 {
        free_irq(gpio_to_irq(TOSA_GPIO_JACKET_DETECT), &tosa_bat_jacket);
        free_irq(gpio_to_irq(TOSA_GPIO_BAT1_CRG), &tosa_bat_jacket);

diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c
index ef3b81788752f164e49254b71f2902adfcb53111..d9cc169f1424d94624fb7fe24e41ef4be3657822 100644 (file)
--- a/drivers/power/wm831x_backup.c
+++ b/drivers/power/wm831x_backup.c
@@ -207,7 +207,7 @@ err_kmalloc:
        return ret;
 }
 
-static __devexit int wm831x_backup_remove(struct platform_device *pdev)
+static int wm831x_backup_remove(struct platform_device *pdev)
 {
        struct wm831x_backup *devdata = platform_get_drvdata(pdev);
 

diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index d21af8a01af3070474ab517026f8618fb92e7b7d..3bed2f55cf7d1532cfb1552c6c7c95a15d228098 100644 (file)
--- a/drivers/power/wm831x_power.c
+++ b/drivers/power/wm831x_power.c
@@ -625,7 +625,7 @@ err_kmalloc:
        return ret;
 }
 
-static __devexit int wm831x_power_remove(struct platform_device *pdev)
+static int wm831x_power_remove(struct platform_device *pdev)
 {
        struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
        struct wm831x *wm831x = wm831x_power->wm831x;

diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c
index 6acb63a41a2d7e6b1492f61071a5312077ff9358..b3607e2906d2725f68cc57335431df2db42e006f 100644 (file)
--- a/drivers/power/wm8350_power.c
+++ b/drivers/power/wm8350_power.c
@@ -501,7 +501,7 @@ battery_failed:
        return ret;
 }
 
-static __devexit int wm8350_power_remove(struct platform_device *pdev)
+static int wm8350_power_remove(struct platform_device *pdev)
 {
        struct wm8350 *wm8350 = platform_get_drvdata(pdev);
        struct wm8350_power *power = &wm8350->power;

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

diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index ebf16296aca3a2fef3a3248c546d47db32f78086..814d2e31f0c97efeb5b589476679c3a9e8cf3628 100644 (file)
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -251,7 +251,7 @@ err:
        return ret;
 }
 
-static int __devexit z2_batt_remove(struct i2c_client *client)
+static int z2_batt_remove(struct i2c_client *client)
 {
        struct z2_charger *charger = i2c_get_clientdata(client);
        struct z2_battery_info *info = charger->info;