gpio: 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>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

35 files changed, 35 insertions, 35 deletions

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index f05e54258ffb..ee1cb30e7608 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -215,7 +215,7 @@ static struct spi_driver gen_74x164_driver = {
                 .of_match_table = of_match_ptr(gen_74x164_dt_ids),
         },
         .probe          = gen_74x164_probe,
-        .remove         = __devexit_p(gen_74x164_remove),
+        .remove         = gen_74x164_remove,
 };
 module_spi_driver(gen_74x164_driver);
 
diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c
index 050c05d91896..48c3babbf3c6 100644
--- a/drivers/gpio/gpio-ab8500.c
+++ b/drivers/gpio/gpio-ab8500.c
@@ -499,7 +499,7 @@ static struct platform_driver ab8500_gpio_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = ab8500_gpio_probe,
-        .remove = __devexit_p(ab8500_gpio_remove),
+        .remove = ab8500_gpio_remove,
 };
 
 static int __init ab8500_gpio_init(void)
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index 3df88336415e..9796b9cbde89 100644
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -601,7 +601,7 @@ static struct i2c_driver adnp_i2c_driver = {
                 .of_match_table = of_match_ptr(adnp_of_match),
         },
         .probe = adnp_i2c_probe,
-        .remove = __devexit_p(adnp_i2c_remove),
+        .remove = adnp_i2c_remove,
         .id_table = adnp_i2c_id,
 };
 module_i2c_driver(adnp_i2c_driver);
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 2f263cc32561..fc01e6d8c46b 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -190,7 +190,7 @@ static struct platform_driver adp5520_gpio_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = adp5520_gpio_probe,
-        .remove         = __devexit_p(adp5520_gpio_remove),
+        .remove         = adp5520_gpio_remove,
 };
 
 module_platform_driver(adp5520_gpio_driver);
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index eeedad42913e..f762269cb624 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -479,7 +479,7 @@ static struct i2c_driver adp5588_gpio_driver = {
                    .name = DRV_NAME,
                    },
         .probe = adp5588_gpio_probe,
-        .remove = __devexit_p(adp5588_gpio_remove),
+        .remove = adp5588_gpio_remove,
         .id_table = adp5588_gpio_id,
 };
 
diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index 8740d2eb06f8..a406573259ad 100644
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -152,7 +152,7 @@ static struct platform_driver arizona_gpio_driver = {
         .driver.name    = "arizona-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = arizona_gpio_probe,
-        .remove         = __devexit_p(arizona_gpio_remove),
+        .remove         = arizona_gpio_remove,
 };
 
 module_platform_driver(arizona_gpio_driver);
diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index 19eda1bbe343..00f98f934d36 100644
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -378,7 +378,7 @@ static struct platform_driver cs5535_gpio_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = cs5535_gpio_probe,
-        .remove = __devexit_p(cs5535_gpio_remove),
+        .remove = cs5535_gpio_remove,
 };
 
 module_platform_driver(cs5535_gpio_driver);
diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 24b8c2974047..9f5824dfd606 100644
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -238,7 +238,7 @@ static int __devexit da9052_gpio_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_gpio_driver = {
         .probe = da9052_gpio_probe,
-        .remove = __devexit_p(da9052_gpio_remove),
+        .remove = da9052_gpio_remove,
         .driver = {
                 .name   = "da9052-gpio",
                 .owner  = THIS_MODULE,
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index efb4c2d0d132..e246165864ac 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -399,7 +399,7 @@ static int __devexit em_gio_remove(struct platform_device *pdev)
 
 static struct platform_driver em_gio_device_driver = {
         .probe          = em_gio_probe,
-        .remove         = __devexit_p(em_gio_remove),
+        .remove         = em_gio_remove,
         .driver         = {
                 .name   = "em_gio",
         }
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index 82e2e4fe599e..983f0f2a85f4 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -527,7 +527,7 @@ static struct platform_driver bgpio_driver = {
         },
         .id_table = bgpio_id_table,
         .probe = bgpio_pdev_probe,
-        .remove = __devexit_p(bgpio_pdev_remove),
+        .remove = bgpio_pdev_remove,
 };
 
 module_platform_driver(bgpio_driver);
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index d4d617966696..c230263302ca 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -467,7 +467,7 @@ static struct platform_driver ichx_gpio_driver = {
                 .name   = DRV_NAME,
         },
         .probe          = ichx_gpio_probe,
-        .remove         = __devexit_p(ichx_gpio_remove),
+        .remove         = ichx_gpio_remove,
 };
 
 module_platform_driver(ichx_gpio_driver);
diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index f2f000dd70b3..365dd040445b 100644
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -234,7 +234,7 @@ static struct platform_driver ttl_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ttl_probe,
-        .remove         = __devexit_p(ttl_remove),
+        .remove         = ttl_remove,
 };
 
 module_platform_driver(ttl_driver);
diff --git a/drivers/gpio/gpio-langwell.c b/drivers/gpio/gpio-langwell.c
index 202a99207b7d..b8158967eac3 100644
--- a/drivers/gpio/gpio-langwell.c
+++ b/drivers/gpio/gpio-langwell.c
@@ -499,7 +499,7 @@ static int __devexit wp_gpio_remove(struct platform_device *pdev)
 
 static struct platform_driver wp_gpio_driver = {
         .probe          = wp_gpio_probe,
-        .remove         = __devexit_p(wp_gpio_remove),
+        .remove         = wp_gpio_remove,
         .driver         = {
                 .name   = "wp_gpio",
                 .owner  = THIS_MODULE,
diff --git a/drivers/gpio/gpio-max7300.c b/drivers/gpio/gpio-max7300.c
index a5ca0ab1b372..869235f95e86 100644
--- a/drivers/gpio/gpio-max7300.c
+++ b/drivers/gpio/gpio-max7300.c
@@ -72,7 +72,7 @@ static struct i2c_driver max7300_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max7300_probe,
-        .remove = __devexit_p(max7300_remove),
+        .remove = max7300_remove,
         .id_table = max7300_id,
 };
 
diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c
index 741acfcbe761..31bf49d73f5f 100644
--- a/drivers/gpio/gpio-max7301.c
+++ b/drivers/gpio/gpio-max7301.c
@@ -92,7 +92,7 @@ static struct spi_driver max7301_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max7301_probe,
-        .remove = __devexit_p(max7301_remove),
+        .remove = max7301_remove,
         .id_table = max7301_id,
 };
 
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 9504120812a5..67ef5eae87cd 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -690,7 +690,7 @@ static struct i2c_driver max732x_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = max732x_probe,
-        .remove         = __devexit_p(max732x_remove),
+        .remove         = max732x_remove,
         .id_table       = max732x_id,
 };
 
diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index 2de57ce5feb6..c6572e1de333 100644
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -175,7 +175,7 @@ static struct spi_driver mc33880_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = mc33880_probe,
-        .remove         = __devexit_p(mc33880_remove),
+        .remove         = mc33880_remove,
 };
 
 static int __init mc33880_init(void)
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 0f425189de11..47b6002a73f5 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -533,7 +533,7 @@ static struct i2c_driver mcp230xx_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = mcp230xx_probe,
-        .remove         = __devexit_p(mcp230xx_remove),
+        .remove         = mcp230xx_remove,
         .id_table       = mcp230xx_id,
 };
 
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 6a29ee1847be..c824b5d1acd3 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -606,7 +606,7 @@ static struct pci_driver ioh_gpio_driver = {
         .name = "ml_ioh_gpio",
         .id_table = ioh_gpio_pcidev_id,
         .probe = ioh_gpio_probe,
-        .remove = __devexit_p(ioh_gpio_remove),
+        .remove = ioh_gpio_remove,
         .suspend = ioh_gpio_suspend,
         .resume = ioh_gpio_resume
 };
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index 38305beb4375..26f5122330c2 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -390,7 +390,7 @@ static int __devexit msm_gpio_remove(struct platform_device *dev)
 
 static struct platform_driver msm_gpio_driver = {
         .probe = msm_gpio_probe,
-        .remove = __devexit_p(msm_gpio_remove),
+        .remove = msm_gpio_remove,
         .driver = {
                 .name = "msmgpio",
                 .owner = THIS_MODULE,
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 4ad0c4f9171c..d693560cde4f 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -531,7 +531,7 @@ static struct pci_driver pch_gpio_driver = {
         .name = "pch_gpio",
         .id_table = pch_gpio_pcidev_id,
         .probe = pch_gpio_probe,
-        .remove = __devexit_p(pch_gpio_remove),
+        .remove = pch_gpio_remove,
         .suspend = pch_gpio_suspend,
         .resume = pch_gpio_resume
 };
diff --git a/drivers/gpio/gpio-rc5t583.c b/drivers/gpio/gpio-rc5t583.c
index 08428bf17718..2931514c574a 100644
--- a/drivers/gpio/gpio-rc5t583.c
+++ b/drivers/gpio/gpio-rc5t583.c
@@ -159,7 +159,7 @@ static struct platform_driver rc5t583_gpio_driver = {
                 .owner   = THIS_MODULE,
         },
         .probe          = rc5t583_gpio_probe,
-        .remove         = __devexit_p(rc5t583_gpio_remove),
+        .remove         = rc5t583_gpio_remove,
 };
 
 static int __init rc5t583_gpio_init(void)
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index b62d443e9a59..17b971bffc85 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -225,7 +225,7 @@ static struct platform_driver rdc321x_gpio_driver = {
         .driver.name    = "rdc321x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = rdc321x_gpio_probe,
-        .remove         = __devexit_p(rdc321x_gpio_remove),
+        .remove         = rdc321x_gpio_remove,
 };
 
 module_platform_driver(rdc321x_gpio_driver);
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index 8707d4572a06..ed54425bffe8 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -303,7 +303,7 @@ static struct platform_driver sch_gpio_driver = {
                 .owner = THIS_MODULE,
         },
         .probe          = sch_gpio_probe,
-        .remove         = __devexit_p(sch_gpio_remove),
+        .remove         = sch_gpio_remove,
 };
 
 module_platform_driver(sch_gpio_driver);
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index dce34727bbf8..821392d22137 100644
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -412,7 +412,7 @@ static struct platform_driver stmpe_gpio_driver = {
         .driver.name    = "stmpe-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = stmpe_gpio_probe,
-        .remove         = __devexit_p(stmpe_gpio_remove),
+        .remove         = stmpe_gpio_remove,
 };
 
 static int __init stmpe_gpio_init(void)
diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index eb3e215d2396..0e1472db6a4b 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -646,7 +646,7 @@ static struct i2c_driver sx150x_driver = {
                 .owner = THIS_MODULE
         },
         .probe    = sx150x_probe,
-        .remove   = __devexit_p(sx150x_remove),
+        .remove   = sx150x_remove,
         .id_table = sx150x_id,
 };
 
diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 1e48317e70fb..debe67e595d2 100644
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -419,7 +419,7 @@ static struct platform_driver tc3589x_gpio_driver = {
         .driver.name    = "tc3589x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = tc3589x_gpio_probe,
-        .remove         = __devexit_p(tc3589x_gpio_remove),
+        .remove         = tc3589x_gpio_remove,
 };
 
 static int __init tc3589x_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index 2526b3bb0fae..d048ea81e521 100644
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -137,7 +137,7 @@ static struct platform_driver tps6586x_gpio_driver = {
         .driver.name    = "tps6586x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = tps6586x_gpio_probe,
-        .remove         = __devexit_p(tps6586x_gpio_remove),
+        .remove         = tps6586x_gpio_remove,
 };
 
 static int __init tps6586x_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c
index 11f29c82253c..cf4e327b128b 100644
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -199,7 +199,7 @@ static struct platform_driver tps65910_gpio_driver = {
         .driver.name    = "tps65910-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = tps65910_gpio_probe,
-        .remove         = __devexit_p(tps65910_gpio_remove),
+        .remove         = tps65910_gpio_remove,
 };
 
 static int __init tps65910_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index 99106d1e2e55..55c1d35f2e14 100644
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -126,7 +126,7 @@ static struct platform_driver tps65912_gpio_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps65912_gpio_probe,
-        .remove = __devexit_p(tps65912_gpio_remove),
+        .remove = tps65912_gpio_remove,
 };
 
 static int __init tps65912_gpio_init(void)
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index 82d5c20ad3cb..54d6e9a7400f 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -564,7 +564,7 @@ static int __devexit giu_remove(struct platform_device *pdev)
 
 static struct platform_driver giu_device_driver = {
         .probe          = giu_probe,
-        .remove         = __devexit_p(giu_remove),
+        .remove         = giu_remove,
         .driver         = {
                 .name   = "GIU",
                 .owner  = THIS_MODULE,
diff --git a/drivers/gpio/gpio-vx855.c b/drivers/gpio/gpio-vx855.c
index 76ebfe5ff702..43fcc42576dc 100644
--- a/drivers/gpio/gpio-vx855.c
+++ b/drivers/gpio/gpio-vx855.c
@@ -312,7 +312,7 @@ static struct platform_driver vx855gpio_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = vx855gpio_probe,
-        .remove         = __devexit_p(vx855gpio_remove),
+        .remove         = vx855gpio_remove,
 };
 
 module_platform_driver(vx855gpio_driver);
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index b6eda35089d5..273d541ac6b5 100644
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -286,7 +286,7 @@ static struct platform_driver wm831x_gpio_driver = {
         .driver.name    = "wm831x-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = wm831x_gpio_probe,
-        .remove         = __devexit_p(wm831x_gpio_remove),
+        .remove         = wm831x_gpio_remove,
 };
 
 static int __init wm831x_gpio_init(void)
diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index fb4293889392..348a7d985ee3 100644
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -152,7 +152,7 @@ static struct platform_driver wm8350_gpio_driver = {
         .driver.name    = "wm8350-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = wm8350_gpio_probe,
-        .remove         = __devexit_p(wm8350_gpio_remove),
+        .remove         = wm8350_gpio_remove,
 };
 
 static int __init wm8350_gpio_init(void)
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index 1c764e779d80..59f0944ba484 100644
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -292,7 +292,7 @@ static struct platform_driver wm8994_gpio_driver = {
         .driver.name    = "wm8994-gpio",
         .driver.owner   = THIS_MODULE,
         .probe          = wm8994_gpio_probe,
-        .remove         = __devexit_p(wm8994_gpio_remove),
+        .remove         = wm8994_gpio_remove,
 };
 
 static int __init wm8994_gpio_init(void)