regulator: remove use of __devexit_p

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

56 files changed, 62 insertions, 62 deletions

diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index 1c5ab0172ea2..2d798ca53809 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -481,7 +481,7 @@ static struct platform_driver pm8607_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = pm8607_regulator_probe,
-        .remove         = __devexit_p(pm8607_regulator_remove),
+        .remove         = pm8607_regulator_remove,
         .id_table       = pm8607_regulator_driver_ids,
 };
 
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 167c93f21981..4285b304e2b5 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -201,7 +201,7 @@ static struct platform_driver aat2870_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = aat2870_regulator_probe,
-        .remove = __devexit_p(aat2870_regulator_remove),
+        .remove = aat2870_regulator_remove,
 };
 
 static int __init aat2870_regulator_init(void)
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index df4ad8927f0c..9fae59d41c0a 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -589,7 +589,7 @@ static struct platform_driver ab3100_regulators_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ab3100_regulators_probe,
-        .remove = __devexit_p(ab3100_regulators_remove),
+        .remove = ab3100_regulators_remove,
 };
 
 static __init int ab3100_regulators_init(void)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index e3d1d063025a..987b047fc40a 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -836,7 +836,7 @@ static __devexit int ab8500_regulator_remove(struct platform_device *pdev)
 
 static struct platform_driver ab8500_regulator_driver = {
         .probe = ab8500_regulator_probe,
-        .remove = __devexit_p(ab8500_regulator_remove),
+        .remove = ab8500_regulator_remove,
         .driver         = {
                 .name   = "ab8500-regulator",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
index f123f7e3b752..7921d014bcaf 100644
--- a/drivers/regulator/ad5398.c
+++ b/drivers/regulator/ad5398.c
@@ -266,7 +266,7 @@ static int __devexit ad5398_remove(struct i2c_client *client)
 
 static struct i2c_driver ad5398_driver = {
         .probe = ad5398_probe,
-        .remove = __devexit_p(ad5398_remove),
+        .remove = ad5398_remove,
         .driver         = {
                 .name   = "ad5398",
         },
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 1af97686f444..e8ae65657345 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -210,7 +210,7 @@ static struct platform_driver anatop_regulator_driver = {
                 .of_match_table = of_anatop_regulator_match_tbl,
         },
         .probe  = anatop_regulator_probe,
-        .remove = __devexit_p(anatop_regulator_remove),
+        .remove = anatop_regulator_remove,
 };
 
 static int __init anatop_regulator_init(void)
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index d184aa35abcb..7502394ef6ff 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -126,7 +126,7 @@ static __devexit int arizona_ldo1_remove(struct platform_device *pdev)
 
 static struct platform_driver arizona_ldo1_driver = {
         .probe = arizona_ldo1_probe,
-        .remove = __devexit_p(arizona_ldo1_remove),
+        .remove = arizona_ldo1_remove,
         .driver         = {
                 .name   = "arizona-ldo1",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index d9b1f82cc5bd..8c6eeba766a5 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -177,7 +177,7 @@ static __devexit int arizona_micsupp_remove(struct platform_device *pdev)
 
 static struct platform_driver arizona_micsupp_driver = {
         .probe = arizona_micsupp_probe,
-        .remove = __devexit_p(arizona_micsupp_remove),
+        .remove = arizona_micsupp_remove,
         .driver         = {
                 .name   = "arizona-micsupp",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 36c5b92fe0af..43db3a510cbc 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -513,7 +513,7 @@ static struct platform_driver da903x_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = da903x_regulator_probe,
-        .remove         = __devexit_p(da903x_regulator_remove),
+        .remove         = da903x_regulator_remove,
 };
 
 static int __init da903x_regulator_init(void)
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index 27355b1199e5..9caa6e619802 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -440,7 +440,7 @@ static int __devexit da9052_regulator_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_regulator_driver = {
         .probe = da9052_regulator_probe,
-        .remove = __devexit_p(da9052_regulator_remove),
+        .remove = da9052_regulator_remove,
         .driver = {
                 .name = "da9052-regulator",
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 339f4d732e97..5279eff3a53f 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -311,7 +311,7 @@ static struct i2c_driver fan53555_regulator_driver = {
                 .name = "fan53555-regulator",
         },
         .probe = fan53555_regulator_probe,
-        .remove = __devexit_p(fan53555_regulator_remove),
+        .remove = fan53555_regulator_remove,
         .id_table = fan53555_id,
 };
 
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 185468c4d38f..73a6a59d703e 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(of, fixed_of_match);
 
 static struct platform_driver regulator_fixed_voltage_driver = {
         .probe          = reg_fixed_voltage_probe,
-        .remove         = __devexit_p(reg_fixed_voltage_remove),
+        .remove         = reg_fixed_voltage_remove,
         .driver         = {
                 .name           = "reg-fixed-voltage",
                 .owner          = THIS_MODULE,
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index dc9260545b80..902e041a3304 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -371,7 +371,7 @@ static const struct of_device_id regulator_gpio_of_match[] __devinitconst = {
 
 static struct platform_driver gpio_regulator_driver = {
         .probe          = gpio_regulator_probe,
-        .remove         = __devexit_p(gpio_regulator_remove),
+        .remove         = gpio_regulator_remove,
         .driver         = {
                 .name           = "gpio-regulator",
                 .owner          = THIS_MODULE,
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index d8ecf49a5777..2c415e9eaefc 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -174,7 +174,7 @@ static struct i2c_driver isl6271a_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = isl6271a_probe,
-        .remove = __devexit_p(isl6271a_remove),
+        .remove = isl6271a_remove,
         .id_table = isl6271a_id,
 };
 
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 7c6e3b8ff484..e10726a9f455 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -498,7 +498,7 @@ static struct i2c_driver lp3971_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe    = lp3971_i2c_probe,
-        .remove   = __devexit_p(lp3971_i2c_remove),
+        .remove   = lp3971_i2c_remove,
         .id_table = lp3971_i2c_id,
 };
 
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c
index 3cdc755d9b22..262f2d2530b0 100644
--- a/drivers/regulator/lp3972.c
+++ b/drivers/regulator/lp3972.c
@@ -594,7 +594,7 @@ static struct i2c_driver lp3972_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe    = lp3972_i2c_probe,
-        .remove   = __devexit_p(lp3972_i2c_remove),
+        .remove   = lp3972_i2c_remove,
         .id_table = lp3972_i2c_id,
 };
 
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index 708f4b6a17dc..622ad5e5bab0 100644
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -914,7 +914,7 @@ static struct i2c_driver lp872x_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = lp872x_probe,
-        .remove = __devexit_p(lp872x_remove),
+        .remove = lp872x_remove,
         .id_table = lp872x_ids,
 };
 
diff --git a/drivers/regulator/lp8788-buck.c b/drivers/regulator/lp8788-buck.c
index ba3e0aa402de..35643d2a80e8 100644
--- a/drivers/regulator/lp8788-buck.c
+++ b/drivers/regulator/lp8788-buck.c
@@ -554,7 +554,7 @@ static int __devexit lp8788_buck_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_buck_driver = {
         .probe = lp8788_buck_probe,
-        .remove = __devexit_p(lp8788_buck_remove),
+        .remove = lp8788_buck_remove,
         .driver = {
                 .name = LP8788_DEV_BUCK,
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/lp8788-ldo.c b/drivers/regulator/lp8788-ldo.c
index 6796eeb47dc6..93399f151a5d 100644
--- a/drivers/regulator/lp8788-ldo.c
+++ b/drivers/regulator/lp8788-ldo.c
@@ -761,7 +761,7 @@ static int __devexit lp8788_dldo_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_dldo_driver = {
         .probe = lp8788_dldo_probe,
-        .remove = __devexit_p(lp8788_dldo_remove),
+        .remove = lp8788_dldo_remove,
         .driver = {
                 .name = LP8788_DEV_DLDO,
                 .owner = THIS_MODULE,
@@ -817,7 +817,7 @@ static int __devexit lp8788_aldo_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_aldo_driver = {
         .probe = lp8788_aldo_probe,
-        .remove = __devexit_p(lp8788_aldo_remove),
+        .remove = lp8788_aldo_remove,
         .driver = {
                 .name = LP8788_DEV_ALDO,
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c
index f67af3c1b963..184a92feca70 100644
--- a/drivers/regulator/max1586.c
+++ b/drivers/regulator/max1586.c
@@ -207,7 +207,7 @@ MODULE_DEVICE_TABLE(i2c, max1586_id);
 
 static struct i2c_driver max1586_pmic_driver = {
         .probe = max1586_pmic_probe,
-        .remove = __devexit_p(max1586_pmic_remove),
+        .remove = max1586_pmic_remove,
         .driver         = {
                 .name   = "max1586",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index 2a67d08658ad..7374f5edab0c 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -360,7 +360,7 @@ static struct platform_driver max77686_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max77686_pmic_probe,
-        .remove = __devexit_p(max77686_pmic_remove),
+        .remove = max77686_pmic_remove,
         .id_table = max77686_pmic_id,
 };
 
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 9d540cd02dab..d78d4aa37167 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -291,7 +291,7 @@ MODULE_DEVICE_TABLE(i2c, max8649_id);
 
 static struct i2c_driver max8649_driver = {
         .probe          = max8649_regulator_probe,
-        .remove         = __devexit_p(max8649_regulator_remove),
+        .remove         = max8649_regulator_remove,
         .driver         = {
                 .name   = "max8649",
         },
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 8d531742f593..b009a5e7942b 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -440,7 +440,7 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
 
 static struct i2c_driver max8660_driver = {
         .probe = max8660_probe,
-        .remove = __devexit_p(max8660_remove),
+        .remove = max8660_remove,
         .driver         = {
                 .name   = "max8660",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c
index af7607515ab9..882e7cb3c943 100644
--- a/drivers/regulator/max8907-regulator.c
+++ b/drivers/regulator/max8907-regulator.c
@@ -385,7 +385,7 @@ static struct platform_driver max8907_regulator_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = max8907_regulator_probe,
-        .remove = __devexit_p(max8907_regulator_remove),
+        .remove = max8907_regulator_remove,
 };
 
 static int __init max8907_regulator_init(void)
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index 2b549791c975..85d419ed4a46 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -339,7 +339,7 @@ static struct platform_driver max8925_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = max8925_regulator_probe,
-        .remove         = __devexit_p(max8925_regulator_remove),
+        .remove         = max8925_regulator_remove,
 };
 
 static int __init max8925_regulator_init(void)
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 355ca7bad9d5..d575e5f92cdd 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -268,7 +268,7 @@ MODULE_DEVICE_TABLE(i2c, max8952_ids);
 
 static struct i2c_driver max8952_pmic_driver = {
         .probe          = max8952_pmic_probe,
-        .remove         = __devexit_p(max8952_pmic_remove),
+        .remove         = max8952_pmic_remove,
         .driver         = {
                 .name   = "max8952",
         },
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index e39a0c7260dc..2b97ec8f6a83 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1143,7 +1143,7 @@ static struct platform_driver max8997_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max8997_pmic_probe,
-        .remove = __devexit_p(max8997_pmic_remove),
+        .remove = max8997_pmic_remove,
         .id_table = max8997_pmic_id,
 };
 
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 5dfa920ff0c8..1edb01c9bdcd 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -842,7 +842,7 @@ static struct platform_driver max8998_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max8998_pmic_probe,
-        .remove = __devexit_p(max8998_pmic_remove),
+        .remove = max8998_pmic_remove,
         .id_table = max8998_pmic_id,
 };
 
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 0801a6d0c122..940f659f6318 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -465,7 +465,7 @@ static struct platform_driver mc13783_regulator_driver = {
                 .name   = "mc13783-regulator",
                 .owner  = THIS_MODULE,
         },
-        .remove         = __devexit_p(mc13783_regulator_remove),
+        .remove         = mc13783_regulator_remove,
         .probe          = mc13783_regulator_probe,
 };
 
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index 1fa63812f7ac..f3646cffa7ba 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -606,7 +606,7 @@ static struct platform_driver mc13892_regulator_driver = {
                 .name   = "mc13892-regulator",
                 .owner  = THIS_MODULE,
         },
-        .remove = __devexit_p(mc13892_regulator_remove),
+        .remove = mc13892_regulator_remove,
         .probe  = mc13892_regulator_probe,
 };
 
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 07aee694ba92..4e0d3b5934d3 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -890,7 +890,7 @@ static struct platform_driver palmas_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = palmas_probe,
-        .remove = __devexit_p(palmas_remove),
+        .remove = palmas_remove,
 };
 
 static int __init palmas_init(void)
diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c
index 68777acc099f..1f349bfd6717 100644
--- a/drivers/regulator/pcap-regulator.c
+++ b/drivers/regulator/pcap-regulator.c
@@ -271,7 +271,7 @@ static struct platform_driver pcap_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = pcap_regulator_probe,
-        .remove = __devexit_p(pcap_regulator_remove),
+        .remove = pcap_regulator_remove,
 };
 
 static int __init pcap_regulator_init(void)
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
index 092e5cb848a1..02c9e1c5d4ca 100644
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@ -237,7 +237,7 @@ static struct platform_driver pcf50633_regulator_driver = {
                 .name = "pcf50633-regltr",
         },
         .probe = pcf50633_regulator_probe,
-        .remove = __devexit_p(pcf50633_regulator_remove),
+        .remove = pcf50633_regulator_remove,
 };
 
 static int __init pcf50633_regulator_init(void)
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c
index 8bf4e8c9de9a..ca2b5edcdb82 100644
--- a/drivers/regulator/rc5t583-regulator.c
+++ b/drivers/regulator/rc5t583-regulator.c
@@ -214,7 +214,7 @@ static struct platform_driver rc5t583_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = rc5t583_regulator_probe,
-        .remove         = __devexit_p(rc5t583_regulator_remove),
+        .remove         = rc5t583_regulator_remove,
 };
 
 static int __init rc5t583_regulator_init(void)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 926f9c8f2fac..c2723caf15ea 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -330,7 +330,7 @@ static struct platform_driver s2mps11_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = s2mps11_pmic_probe,
-        .remove = __devexit_p(s2mps11_pmic_remove),
+        .remove = s2mps11_pmic_remove,
         .id_table = s2mps11_pmic_id,
 };
 
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index abe64a32aedf..d606ca0347b6 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -798,7 +798,7 @@ static struct platform_driver s5m8767_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = s5m8767_pmic_probe,
-        .remove = __devexit_p(s5m8767_pmic_remove),
+        .remove = s5m8767_pmic_remove,
         .id_table = s5m8767_pmic_id,
 };
 
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index 34603640d6d9..687b0ccc5441 100644
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -311,7 +311,7 @@ static struct i2c_driver tps51632_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps51632_probe,
-        .remove = __devexit_p(tps51632_remove),
+        .remove = tps51632_remove,
         .id_table = tps51632_id,
 };
 
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index 1378409efaec..9516f44474ef 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -172,7 +172,7 @@ static struct platform_driver tps6105x_regulator_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps6105x_regulator_probe,
-        .remove = __devexit_p(tps6105x_regulator_remove),
+        .remove = tps6105x_regulator_remove,
 };
 
 static __init int tps6105x_regulator_init(void)
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c
index 68729a7c8709..bd0f9f850b52 100644
--- a/drivers/regulator/tps62360-regulator.c
+++ b/drivers/regulator/tps62360-regulator.c
@@ -531,7 +531,7 @@ static struct i2c_driver tps62360_i2c_driver = {
                 .of_match_table = of_match_ptr(tps62360_of_match),
         },
         .probe = tps62360_probe,
-        .remove = __devexit_p(tps62360_remove),
+        .remove = tps62360_remove,
         .shutdown = tps62360_shutdown,
         .id_table = tps62360_id,
 };
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 6998d579d07b..427b311f4d2a 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -446,7 +446,7 @@ static struct i2c_driver tps_65023_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps_65023_probe,
-        .remove = __devexit_p(tps_65023_remove),
+        .remove = tps_65023_remove,
         .id_table = tps_65023_id,
 };
 
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index 07d01ccdf308..c953e8f54076 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -456,7 +456,7 @@ static struct platform_driver tps6507x_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps6507x_pmic_probe,
-        .remove = __devexit_p(tps6507x_pmic_remove),
+        .remove = tps6507x_pmic_remove,
 };
 
 static int __init tps6507x_pmic_init(void)
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index 412413838e12..99c912be739e 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -251,7 +251,7 @@ static struct platform_driver tps65090_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps65090_regulator_probe,
-        .remove         = __devexit_p(tps65090_regulator_remove),
+        .remove         = tps65090_regulator_remove,
 };
 
 static int __init tps65090_regulator_init(void)
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c
index ab00cab905b7..73681ea2f5f4 100644
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@ -415,7 +415,7 @@ static struct platform_driver tps65217_regulator_driver = {
                 .name = "tps65217-pmic",
         },
         .probe = tps65217_regulator_probe,
-        .remove = __devexit_p(tps65217_regulator_remove),
+        .remove = tps65217_regulator_remove,
 };
 
 static int __init tps65217_regulator_init(void)
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 058d2f2675e9..f5a01bc104ac 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -649,7 +649,7 @@ fail:
 
 static struct spi_driver pmic_driver = {
         .probe          = pmic_probe,
-        .remove         = __devexit_p(pmic_remove),
+        .remove         = pmic_remove,
         .driver         = {
                 .name   = "tps6524x",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index ce1e7cb8d513..491b16a48758 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -349,7 +349,7 @@ static struct platform_driver tps6586x_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps6586x_regulator_probe,
-        .remove         = __devexit_p(tps6586x_regulator_remove),
+        .remove         = tps6586x_regulator_remove,
 };
 
 static int __init tps6586x_regulator_init(void)
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 793adda560c3..2e1e57bb0792 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -1231,7 +1231,7 @@ static struct platform_driver tps65910_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps65910_probe,
-        .remove = __devexit_p(tps65910_remove),
+        .remove = tps65910_remove,
         .shutdown = tps65910_shutdown,
 };
 
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 18b2a1dcb4b5..ba7e62335e2b 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -541,7 +541,7 @@ static struct platform_driver tps65912_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps65912_probe,
-        .remove = __devexit_p(tps65912_remove),
+        .remove = tps65912_remove,
 };
 
 static int __init tps65912_init(void)
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index a37ede80abbf..d90c23b44ad4 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -772,7 +772,7 @@ static struct platform_driver tps80031_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps80031_regulator_probe,
-        .remove         = __devexit_p(tps80031_regulator_remove),
+        .remove         = tps80031_regulator_remove,
 };
 
 static int __init tps80031_regulator_init(void)
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 7eb986a40746..eac854038c28 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1255,7 +1255,7 @@ MODULE_ALIAS("platform:twl_reg");
 
 static struct platform_driver twlreg_driver = {
         .probe          = twlreg_probe,
-        .remove         = __devexit_p(twlreg_remove),
+        .remove         = twlreg_remove,
         /* NOTE: short name, to work around driver model truncation of
          * "twl_regulator.12" (and friends) to "twl_regulator.1".
          */
diff --git a/drivers/regulator/vexpress.c b/drivers/regulator/vexpress.c
index 1d558111d60f..405620197a23 100644
--- a/drivers/regulator/vexpress.c
+++ b/drivers/regulator/vexpress.c
@@ -131,7 +131,7 @@ static struct of_device_id vexpress_regulator_of_match[] = {
 
 static struct platform_driver vexpress_regulator_driver = {
         .probe = vexpress_regulator_probe,
-        .remove = __devexit_p(vexpress_regulator_remove),
+        .remove = vexpress_regulator_remove,
         .driver = {
                 .name = DRVNAME,
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c
index c038e7422538..ec97b3e3fbbb 100644
--- a/drivers/regulator/virtual.c
+++ b/drivers/regulator/virtual.c
@@ -337,7 +337,7 @@ static int __devexit regulator_virtual_remove(struct platform_device *pdev)
 
 static struct platform_driver regulator_virtual_consumer_driver = {
         .probe          = regulator_virtual_probe,
-        .remove         = __devexit_p(regulator_virtual_remove),
+        .remove         = regulator_virtual_remove,
         .driver         = {
                 .name           = "reg-virt-consumer",
                 .owner          = THIS_MODULE,
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 782c228a19bd..16d7ebd88016 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -582,7 +582,7 @@ static __devexit int wm831x_buckv_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_buckv_driver = {
         .probe = wm831x_buckv_probe,
-        .remove = __devexit_p(wm831x_buckv_remove),
+        .remove = wm831x_buckv_remove,
         .driver         = {
                 .name   = "wm831x-buckv",
                 .owner  = THIS_MODULE,
@@ -725,7 +725,7 @@ static __devexit int wm831x_buckp_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_buckp_driver = {
         .probe = wm831x_buckp_probe,
-        .remove = __devexit_p(wm831x_buckp_remove),
+        .remove = wm831x_buckp_remove,
         .driver         = {
                 .name   = "wm831x-buckp",
                 .owner  = THIS_MODULE,
@@ -860,7 +860,7 @@ static __devexit int wm831x_boostp_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_boostp_driver = {
         .probe = wm831x_boostp_probe,
-        .remove = __devexit_p(wm831x_boostp_remove),
+        .remove = wm831x_boostp_remove,
         .driver         = {
                 .name   = "wm831x-boostp",
                 .owner  = THIS_MODULE,
@@ -948,7 +948,7 @@ static __devexit int wm831x_epe_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_epe_driver = {
         .probe = wm831x_epe_probe,
-        .remove = __devexit_p(wm831x_epe_remove),
+        .remove = wm831x_epe_remove,
         .driver         = {
                 .name   = "wm831x-epe",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 2646a1902b33..1f807a842db3 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -236,7 +236,7 @@ static __devexit int wm831x_isink_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_isink_driver = {
         .probe = wm831x_isink_probe,
-        .remove = __devexit_p(wm831x_isink_remove),
+        .remove = wm831x_isink_remove,
         .driver         = {
                 .name   = "wm831x-isink",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index c2dc03993dc7..2df06008cf51 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -349,7 +349,7 @@ static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_gp_ldo_driver = {
         .probe = wm831x_gp_ldo_probe,
-        .remove = __devexit_p(wm831x_gp_ldo_remove),
+        .remove = wm831x_gp_ldo_remove,
         .driver         = {
                 .name   = "wm831x-ldo",
                 .owner  = THIS_MODULE,
@@ -603,7 +603,7 @@ static __devexit int wm831x_aldo_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_aldo_driver = {
         .probe = wm831x_aldo_probe,
-        .remove = __devexit_p(wm831x_aldo_remove),
+        .remove = wm831x_aldo_remove,
         .driver         = {
                 .name   = "wm831x-aldo",
                 .owner  = THIS_MODULE,
@@ -748,7 +748,7 @@ static __devexit int wm831x_alive_ldo_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_alive_ldo_driver = {
         .probe = wm831x_alive_ldo_probe,
-        .remove = __devexit_p(wm831x_alive_ldo_remove),
+        .remove = wm831x_alive_ldo_remove,
         .driver         = {
                 .name   = "wm831x-alive-ldo",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 27c746ef0636..1bb155152aa8 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -261,7 +261,7 @@ static struct platform_driver wm8400_regulator_driver = {
                 .name = "wm8400-regulator",
         },
         .probe = wm8400_regulator_probe,
-        .remove = __devexit_p(wm8400_regulator_remove),
+        .remove = wm8400_regulator_remove,
 };
 
 /**
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 86bb48db149e..28b45481c7d4 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -155,7 +155,7 @@ static __devexit int wm8994_ldo_remove(struct platform_device *pdev)
 
 static struct platform_driver wm8994_ldo_driver = {
         .probe = wm8994_ldo_probe,
-        .remove = __devexit_p(wm8994_ldo_remove),
+        .remove = wm8994_ldo_remove,
         .driver         = {
                 .name   = "wm8994-ldo",
                 .owner  = THIS_MODULE,