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>

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index f05e54258ffb0a7c1b62eb54be11f2f8ed9486d8..ee1cb30e760884f5087dce2d613f5672c0d2da93 100644 (file)
--- 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 050c05d91896b638df5072aec10c0f1e69f9bda7..48c3babbf3c657ea338c3d18f7748b37350fcf7c 100644 (file)
--- 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 3df88336415ed5309a6fd104e1dd522fa46f3eb4..9796b9cbde898fdd65e9d687d128c2cba8f0ba6e 100644 (file)
--- 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 2f263cc325616e49ce8065df4686f3dbbdb6cd92..fc01e6d8c46b0079391c2b61432fce004bda72ce 100644 (file)
--- 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 eeedad42913e3074703082ac434588036f9954ea..f762269cb624ea19ca7fb04cb28c0c63a0a6a1e0 100644 (file)
--- 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 8740d2eb06f8e1e05e4a04c36ef423a5d149569e..a406573259ad329e1f83cdb06a6d517e3f94381b 100644 (file)
--- 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 19eda1bbe343da9e0453fd665deb05b683305e66..00f98f934d36020b35662263d38e894b363e29d2 100644 (file)
--- 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 24b8c2974047967b3fe4e4caff32e5b7d9dda17e..9f5824dfd6069c0374f96682f83f2ce46f9787cb 100644 (file)
--- 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 efb4c2d0d132912a05b63372ee479a71db4e7377..e246165864ac107aaa60496c318af833a4b48b32 100644 (file)
--- 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 82e2e4fe599ebd6934fba12494c5d1206fdb1270..983f0f2a85f4a9f7c54edfa770df6dd6cb0888ae 100644 (file)
--- 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 d4d61796669675696ce30711796773b4f7d1fa36..c230263302ca9431b016ef6f4fda4fd7f575bea3 100644 (file)
--- 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 f2f000dd70b369423517ace20da9ae57cc0d3600..365dd040445bdd4a83a3db7263a2936e2542eda3 100644 (file)
--- 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 202a99207b7d40c1a0e98dbe728cb7f782704a0d..b8158967eac38ad32f600d0e57136659a90fbb23 100644 (file)
--- 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 a5ca0ab1b372cb419a73cc7fd8101258e311c76e..869235f95e868340156eeb430e8d7895aec096da 100644 (file)
--- 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 741acfcbe761a4f7f28dfdeb32f0a602f15f9086..31bf49d73f5fcd18b6fad35e295cf89817b7d8c9 100644 (file)
--- 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 9504120812a50c1f819c4ed63340cef98e694c53..67ef5eae87cdd44bb0d22276f401eccefea12c31 100644 (file)
--- 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 2de57ce5feb6c65d7b02ca0a3d462d01a80a5116..c6572e1de3331322a30094056980d70cf28c6def 100644 (file)
--- 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 0f425189de11b3b5b8003a9c9abb330d9debd116..47b6002a73f580f9ca9d67ba5d6fd02de4179e47 100644 (file)
--- 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 6a29ee1847be92ad0038d0c0f828c1e0ac92fcb0..c824b5d1acd3a215240a2b52d79eee12504627ac 100644 (file)
--- 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 38305beb437572d9de5cbb6389c37524bb3423a2..26f5122330c25b8b35386f40637505252813d207 100644 (file)
--- 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 4ad0c4f9171c18f4c7baa2cf1f253b1ea08af495..d693560cde4fa3525e4932f8b008ff2766f2f2cb 100644 (file)
--- 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 08428bf1771892e7de0a9d6f5acf2bfd26be038c..2931514c574ab5882d622f1409675b9d5e9fd3cc 100644 (file)
--- 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 b62d443e9a59125518289229b0a90c6d58503363..17b971bffc85b16a3d18f13d366314286ff34fd6 100644 (file)
--- 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 8707d4572a06bfee4713fab5b521cd58f220aefa..ed54425bffe88b0afee13a96d53e080d2660c7b7 100644 (file)
--- 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 dce34727bbf8774895e471ca32b6a025842c99ee..821392d22137510baf19f5678c0005516d22c597 100644 (file)
--- 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 eb3e215d23963f0c91b1612f652664aaa515408c..0e1472db6a4be6792ba9e8334792582fc526ec9f 100644 (file)
--- 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 1e48317e70fb045838b8053cc135055e7765c4ac..debe67e595d209f2337b2bd5eb93121109e889fd 100644 (file)
--- 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 2526b3bb0fae94a2cd20c3e8466ad29a4c8c8f0d..d048ea81e52152954876bfd02a06ed3739eefb70 100644 (file)
--- 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 11f29c82253c4af5fca18b09f26923a8aa3a48a3..cf4e327b128b975f111ffae8ea565c227a3fbc6a 100644 (file)
--- 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 99106d1e2e551592db75a9352d4c23fb9c0b0d3b..55c1d35f2e147a645b805c81cdc98910067b3a74 100644 (file)
--- 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 82d5c20ad3cbfd8cadaa8b45f322dc1f037b983a..54d6e9a7400f127b651646e09961a6f1646adb5a 100644 (file)
--- 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 76ebfe5ff70219ef9faea3f39c6fa614f0e8cceb..43fcc42576dcb68b334ad5d3c4f00a4250103978 100644 (file)
--- 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 b6eda35089d5d9883515eb88584b37430fede672..273d541ac6b5171ea4e6e3950096f13a1895b4a3 100644 (file)
--- 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 fb42938893923d13a771b29d940c8e5a31118ceb..348a7d985ee3abba61e8cf38a478a89856a87a0e 100644 (file)
--- 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 1c764e779d8009b066bb61d93426eb7384cf99d3..59f0944ba48416d9bf8196db2c3a03faca058fe7 100644 (file)
--- 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)