Input: 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>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

40 files changed, 41 insertions, 41 deletions

diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c
index 7f26e7b6c228..f77557523bb9 100644
--- a/drivers/input/misc/88pm80x_onkey.c
+++ b/drivers/input/misc/88pm80x_onkey.c
@@ -157,7 +157,7 @@ static struct platform_driver pm80x_onkey_driver = {
                    .pm = &pm80x_onkey_pm_ops,
                    },
         .probe = pm80x_onkey_probe,
-        .remove = __devexit_p(pm80x_onkey_remove),
+        .remove = pm80x_onkey_remove,
 };
 
 module_platform_driver(pm80x_onkey_driver);
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
index f9ce1835e4d7..8391a9d86ab5 100644
--- a/drivers/input/misc/88pm860x_onkey.c
+++ b/drivers/input/misc/88pm860x_onkey.c
@@ -161,7 +161,7 @@ static struct platform_driver pm860x_onkey_driver = {
                 .pm     = &pm860x_onkey_pm_ops,
         },
         .probe          = pm860x_onkey_probe,
-        .remove         = __devexit_p(pm860x_onkey_remove),
+        .remove         = pm860x_onkey_remove,
 };
 module_platform_driver(pm860x_onkey_driver);
 
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 84ec691c05aa..ae9c20522dbd 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -146,7 +146,7 @@ static struct platform_driver ab8500_ponkey_driver = {
                 .of_match_table = of_match_ptr(ab8500_ponkey_match),
         },
         .probe          = ab8500_ponkey_probe,
-        .remove         = __devexit_p(ab8500_ponkey_remove),
+        .remove         = ab8500_ponkey_remove,
 };
 module_platform_driver(ab8500_ponkey_driver);
 
diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c
index c8a79015472a..02e21d4f5e73 100644
--- a/drivers/input/misc/ad714x-i2c.c
+++ b/drivers/input/misc/ad714x-i2c.c
@@ -112,7 +112,7 @@ static struct i2c_driver ad714x_i2c_driver = {
                 .pm   = &ad714x_i2c_pm,
         },
         .probe    = ad714x_i2c_probe,
-        .remove   = __devexit_p(ad714x_i2c_remove),
+        .remove   = ad714x_i2c_remove,
         .id_table = ad714x_id,
 };
 
diff --git a/drivers/input/misc/ad714x-spi.c b/drivers/input/misc/ad714x-spi.c
index 75f6136d608e..eee820b41356 100644
--- a/drivers/input/misc/ad714x-spi.c
+++ b/drivers/input/misc/ad714x-spi.c
@@ -120,7 +120,7 @@ static struct spi_driver ad714x_spi_driver = {
                 .pm     = &ad714x_spi_pm,
         },
         .probe          = ad714x_spi_probe,
-        .remove         = __devexit_p(ad714x_spi_remove),
+        .remove         = ad714x_spi_remove,
 };
 
 module_spi_driver(ad714x_spi_driver);
diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
index dd1d1c145a7f..09094ca972c7 100644
--- a/drivers/input/misc/adxl34x-i2c.c
+++ b/drivers/input/misc/adxl34x-i2c.c
@@ -144,7 +144,7 @@ static struct i2c_driver adxl34x_driver = {
                 .pm = &adxl34x_i2c_pm,
         },
         .probe    = adxl34x_i2c_probe,
-        .remove   = __devexit_p(adxl34x_i2c_remove),
+        .remove   = adxl34x_i2c_remove,
         .id_table = adxl34x_id,
 };
 
diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c
index 820a802a1e6e..756c899bfa7f 100644
--- a/drivers/input/misc/adxl34x-spi.c
+++ b/drivers/input/misc/adxl34x-spi.c
@@ -126,7 +126,7 @@ static struct spi_driver adxl34x_driver = {
                 .pm = &adxl34x_spi_pm,
         },
         .probe   = adxl34x_spi_probe,
-        .remove  = __devexit_p(adxl34x_spi_remove),
+        .remove  = adxl34x_spi_remove,
 };
 
 module_spi_driver(adxl34x_driver);
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 1c4146fccfdf..6df3f88a46dd 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -255,7 +255,7 @@ static const struct dev_pm_ops bfin_rotary_pm_ops = {
 
 static struct platform_driver bfin_rotary_device_driver = {
         .probe          = bfin_rotary_probe,
-        .remove         = __devexit_p(bfin_rotary_remove),
+        .remove         = bfin_rotary_remove,
         .driver         = {
                 .name   = "bfin-rotary",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
index e2f1e9f952b1..0788c94fb460 100644
--- a/drivers/input/misc/bma150.c
+++ b/drivers/input/misc/bma150.c
@@ -670,7 +670,7 @@ static struct i2c_driver bma150_driver = {
         .class          = I2C_CLASS_HWMON,
         .id_table       = bma150_id,
         .probe          = bma150_probe,
-        .remove         = __devexit_p(bma150_remove),
+        .remove         = bma150_remove,
 };
 
 module_i2c_driver(bma150_driver);
diff --git a/drivers/input/misc/cma3000_d0x_i2c.c b/drivers/input/misc/cma3000_d0x_i2c.c
index fe9b85f07792..523b6aabd7fc 100644
--- a/drivers/input/misc/cma3000_d0x_i2c.c
+++ b/drivers/input/misc/cma3000_d0x_i2c.c
@@ -114,7 +114,7 @@ MODULE_DEVICE_TABLE(i2c, cma3000_i2c_id);
 
 static struct i2c_driver cma3000_i2c_driver = {
         .probe          = cma3000_i2c_probe,
-        .remove         = __devexit_p(cma3000_i2c_remove),
+        .remove         = cma3000_i2c_remove,
         .id_table       = cma3000_i2c_id,
         .driver = {
                 .name   = "cma3000_i2c_accl",
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 53e43d295148..659f20df6040 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -157,7 +157,7 @@ MODULE_ALIAS("platform:Cobalt buttons");
 
 static struct platform_driver cobalt_buttons_driver = {
         .probe  = cobalt_buttons_probe,
-        .remove = __devexit_p(cobalt_buttons_remove),
+        .remove = cobalt_buttons_remove,
         .driver = {
                 .name   = "Cobalt buttons",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 3c843cd725fa..acd07e8c32bc 100644
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c
@@ -156,7 +156,7 @@ static int __devexit da9052_onkey_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_onkey_driver = {
         .probe  = da9052_onkey_probe,
-        .remove = __devexit_p(da9052_onkey_remove),
+        .remove = da9052_onkey_remove,
         .driver = {
                 .name   = "da9052-onkey",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c
index 10ebf15070d7..fe434e07dbfc 100644
--- a/drivers/input/misc/da9055_onkey.c
+++ b/drivers/input/misc/da9055_onkey.c
@@ -156,7 +156,7 @@ static int __devexit da9055_onkey_remove(struct platform_device *pdev)
 
 static struct platform_driver da9055_onkey_driver = {
         .probe  = da9055_onkey_probe,
-        .remove = __devexit_p(da9055_onkey_remove),
+        .remove = da9055_onkey_remove,
         .driver = {
                 .name   = "da9055-onkey",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index c1313d8535c3..1afb91cd71fb 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -262,7 +262,7 @@ static int __devexit dm355evm_keys_remove(struct platform_device *pdev)
  */
 static struct platform_driver dm355evm_keys_driver = {
         .probe          = dm355evm_keys_probe,
-        .remove         = __devexit_p(dm355evm_keys_remove),
+        .remove         = dm355evm_keys_remove,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "dm355evm_keys",
diff --git a/drivers/input/misc/gp2ap002a00f.c b/drivers/input/misc/gp2ap002a00f.c
index b6664cfa340a..99ec8d0c6e41 100644
--- a/drivers/input/misc/gp2ap002a00f.c
+++ b/drivers/input/misc/gp2ap002a00f.c
@@ -277,7 +277,7 @@ static struct i2c_driver gp2a_i2c_driver = {
                 .pm     = &gp2a_pm,
         },
         .probe          = gp2a_probe,
-        .remove         = __devexit_p(gp2a_remove),
+        .remove         = gp2a_remove,
         .id_table       = gp2a_i2c_id,
 };
 
diff --git a/drivers/input/misc/gpio_tilt_polled.c b/drivers/input/misc/gpio_tilt_polled.c
index 277a0574c199..bf97679fe522 100644
--- a/drivers/input/misc/gpio_tilt_polled.c
+++ b/drivers/input/misc/gpio_tilt_polled.c
@@ -198,7 +198,7 @@ static int __devexit gpio_tilt_polled_remove(struct platform_device *pdev)
 
 static struct platform_driver gpio_tilt_polled_driver = {
         .probe  = gpio_tilt_polled_probe,
-        .remove = __devexit_p(gpio_tilt_polled_remove),
+        .remove = gpio_tilt_polled_remove,
         .driver = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 50e283068301..18a2970f88ee 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -165,7 +165,7 @@ static struct platform_driver ixp4xx_spkr_platform_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ixp4xx_spkr_probe,
-        .remove         = __devexit_p(ixp4xx_spkr_remove),
+        .remove         = ixp4xx_spkr_remove,
         .shutdown       = ixp4xx_spkr_shutdown,
 };
 module_platform_driver(ixp4xx_spkr_platform_driver);
diff --git a/drivers/input/misc/kxtj9.c b/drivers/input/misc/kxtj9.c
index f46139f19ff1..8414ddb31815 100644
--- a/drivers/input/misc/kxtj9.c
+++ b/drivers/input/misc/kxtj9.c
@@ -663,7 +663,7 @@ static struct i2c_driver kxtj9_driver = {
                 .pm     = &kxtj9_pm_ops,
         },
         .probe          = kxtj9_probe,
-        .remove         = __devexit_p(kxtj9_remove),
+        .remove         = kxtj9_remove,
         .id_table       = kxtj9_id,
 };
 
diff --git a/drivers/input/misc/m68kspkr.c b/drivers/input/misc/m68kspkr.c
index 0c64d9bb718e..f3a3c5e14d00 100644
--- a/drivers/input/misc/m68kspkr.c
+++ b/drivers/input/misc/m68kspkr.c
@@ -104,7 +104,7 @@ static struct platform_driver m68kspkr_platform_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = m68kspkr_probe,
-        .remove         = __devexit_p(m68kspkr_remove),
+        .remove         = m68kspkr_remove,
         .shutdown       = m68kspkr_shutdown,
 };
 
diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
index 0a12b74140d3..3c3db6787e8f 100644
--- a/drivers/input/misc/max8925_onkey.c
+++ b/drivers/input/misc/max8925_onkey.c
@@ -195,7 +195,7 @@ static struct platform_driver max8925_onkey_driver = {
                 .pm     = &max8925_onkey_pm_ops,
         },
         .probe          = max8925_onkey_probe,
-        .remove         = __devexit_p(max8925_onkey_remove),
+        .remove         = max8925_onkey_remove,
 };
 module_platform_driver(max8925_onkey_driver);
 
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index 05b7b8bfaf0a..8db64f652d7a 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -396,7 +396,7 @@ static struct platform_driver max8997_haptic_driver = {
                 .pm     = &max8997_haptic_pm_ops,
         },
         .probe          = max8997_haptic_probe,
-        .remove         = __devexit_p(max8997_haptic_remove),
+        .remove         = max8997_haptic_remove,
         .id_table       = max8997_haptic_id,
 };
 module_platform_driver(max8997_haptic_driver);
diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
index 8428f1e8e83e..a0c35a058318 100644
--- a/drivers/input/misc/mc13783-pwrbutton.c
+++ b/drivers/input/misc/mc13783-pwrbutton.c
@@ -257,7 +257,7 @@ static int __devexit mc13783_pwrbutton_remove(struct platform_device *pdev)
 
 static struct platform_driver mc13783_pwrbutton_driver = {
         .probe          = mc13783_pwrbutton_probe,
-        .remove         = __devexit_p(mc13783_pwrbutton_remove),
+        .remove         = mc13783_pwrbutton_remove,
         .driver         = {
                 .name   = "mc13783-pwrbutton",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
index 873ebced544e..050a246043dc 100644
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
@@ -243,7 +243,7 @@ static struct i2c_driver mma8450_driver = {
                 .of_match_table = mma8450_dt_ids,
         },
         .probe          = mma8450_probe,
-        .remove         = __devexit_p(mma8450_remove),
+        .remove         = mma8450_remove,
         .id_table       = mma8450_id,
 };
 
diff --git a/drivers/input/misc/mpu3050.c b/drivers/input/misc/mpu3050.c
index 306f84c2d8fb..ab114092b9a9 100644
--- a/drivers/input/misc/mpu3050.c
+++ b/drivers/input/misc/mpu3050.c
@@ -471,7 +471,7 @@ static struct i2c_driver mpu3050_i2c_driver = {
                 .of_match_table = mpu3050_of_match,
         },
         .probe          = mpu3050_probe,
-        .remove         = __devexit_p(mpu3050_remove),
+        .remove         = mpu3050_remove,
         .id_table       = mpu3050_ids,
 };
 
diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c
index e09b4fe81913..afd3f5ae17f9 100644
--- a/drivers/input/misc/pcap_keys.c
+++ b/drivers/input/misc/pcap_keys.c
@@ -119,7 +119,7 @@ static int __devexit pcap_keys_remove(struct platform_device *pdev)
 
 static struct platform_driver pcap_keys_device_driver = {
         .probe          = pcap_keys_probe,
-        .remove         = __devexit_p(pcap_keys_remove),
+        .remove         = pcap_keys_remove,
         .driver         = {
                 .name   = "pcap-keys",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c
index 53891de80b0e..3896b0f8e9bb 100644
--- a/drivers/input/misc/pcf50633-input.c
+++ b/drivers/input/misc/pcf50633-input.c
@@ -111,7 +111,7 @@ static struct platform_driver pcf50633_input_driver = {
                 .name = "pcf50633-input",
         },
         .probe = pcf50633_input_probe,
-        .remove = __devexit_p(pcf50633_input_remove),
+        .remove = pcf50633_input_remove,
 };
 module_platform_driver(pcf50633_input_driver);
 
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c
index 544c6635abe9..6c480bf58456 100644
--- a/drivers/input/misc/pcf8574_keypad.c
+++ b/drivers/input/misc/pcf8574_keypad.c
@@ -212,7 +212,7 @@ static struct i2c_driver pcf8574_kp_driver = {
 #endif
         },
         .probe    = pcf8574_kp_probe,
-        .remove   = __devexit_p(pcf8574_kp_remove),
+        .remove   = pcf8574_kp_remove,
         .id_table = pcf8574_kp_id,
 };
 
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index b2484aa07f32..17d6555fec72 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -131,7 +131,7 @@ static struct platform_driver pcspkr_platform_driver = {
                 .pm     = &pcspkr_pm_ops,
         },
         .probe          = pcspkr_probe,
-        .remove         = __devexit_p(pcspkr_remove),
+        .remove         = pcspkr_remove,
         .shutdown       = pcspkr_shutdown,
 };
 module_platform_driver(pcspkr_platform_driver);
diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c
index dfbfb463ea5d..2e0a3bfeff07 100644
--- a/drivers/input/misc/pm8xxx-vibrator.c
+++ b/drivers/input/misc/pm8xxx-vibrator.c
@@ -270,7 +270,7 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL);
 
 static struct platform_driver pm8xxx_vib_driver = {
         .probe          = pm8xxx_vib_probe,
-        .remove         = __devexit_p(pm8xxx_vib_remove),
+        .remove         = pm8xxx_vib_remove,
         .driver         = {
                 .name   = "pm8xxx-vib",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index 0f83d0f1d015..b2396e2ad369 100644
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -206,7 +206,7 @@ static int __devexit pmic8xxx_pwrkey_remove(struct platform_device *pdev)
 
 static struct platform_driver pmic8xxx_pwrkey_driver = {
         .probe          = pmic8xxx_pwrkey_probe,
-        .remove         = __devexit_p(pmic8xxx_pwrkey_remove),
+        .remove         = pmic8xxx_pwrkey_remove,
         .driver         = {
                 .name   = PM8XXX_PWRKEY_DEV_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index 502544c7e0a0..d40c2f630d5e 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -184,7 +184,7 @@ static const struct of_device_id pwm_beeper_match[] = {
 
 static struct platform_driver pwm_beeper_driver = {
         .probe  = pwm_beeper_probe,
-        .remove = __devexit_p(pwm_beeper_remove),
+        .remove = pwm_beeper_remove,
         .driver = {
                 .name   = "pwm-beeper",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/rb532_button.c b/drivers/input/misc/rb532_button.c
index aeb02bcf7233..718dd8367b6a 100644
--- a/drivers/input/misc/rb532_button.c
+++ b/drivers/input/misc/rb532_button.c
@@ -94,7 +94,7 @@ static int __devexit rb532_button_remove(struct platform_device *pdev)
 
 static struct platform_driver rb532_button_driver = {
         .probe = rb532_button_probe,
-        .remove = __devexit_p(rb532_button_remove),
+        .remove = rb532_button_remove,
         .driver = {
                 .name = DRV_NAME,
                 .owner = THIS_MODULE,
diff --git a/drivers/input/misc/retu-pwrbutton.c b/drivers/input/misc/retu-pwrbutton.c
index 3767f43ce37e..4500027d82a0 100644
--- a/drivers/input/misc/retu-pwrbutton.c
+++ b/drivers/input/misc/retu-pwrbutton.c
@@ -83,7 +83,7 @@ static int __devexit retu_pwrbutton_remove(struct platform_device *pdev)
 
 static struct platform_driver retu_pwrbutton_driver = {
         .probe          = retu_pwrbutton_probe,
-        .remove         = __devexit_p(retu_pwrbutton_remove),
+        .remove         = retu_pwrbutton_remove,
         .driver         = {
                 .name   = "retu-pwrbutton",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 99a49e4968d2..b183a0e7a21a 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -325,7 +325,7 @@ static int __devexit rotary_encoder_remove(struct platform_device *pdev)
 
 static struct platform_driver rotary_encoder_driver = {
         .probe          = rotary_encoder_probe,
-        .remove         = __devexit_p(rotary_encoder_remove),
+        .remove         = rotary_encoder_remove,
         .driver         = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index 5d9fd5571199..fd731e86e316 100644
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -158,7 +158,7 @@ static int __devexit sgi_buttons_remove(struct platform_device *pdev)
 
 static struct platform_driver sgi_buttons_driver = {
         .probe  = sgi_buttons_probe,
-        .remove = __devexit_p(sgi_buttons_remove),
+        .remove = sgi_buttons_remove,
         .driver = {
                 .name   = "sgibtns",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 0122f5351577..b9c870251f14 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -263,7 +263,7 @@ static struct platform_driver bbc_beep_driver = {
                 .of_match_table = bbc_beep_match,
         },
         .probe          = bbc_beep_probe,
-        .remove         = __devexit_p(bbc_remove),
+        .remove         = bbc_remove,
         .shutdown       = sparcspkr_shutdown,
 };
 
@@ -345,7 +345,7 @@ static struct platform_driver grover_beep_driver = {
                 .of_match_table = grover_beep_match,
         },
         .probe          = grover_beep_probe,
-        .remove         = __devexit_p(grover_remove),
+        .remove         = grover_remove,
         .shutdown       = sparcspkr_shutdown,
 };
 
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 2194a3c7236a..29f2207c5d04 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -283,7 +283,7 @@ static int __devexit twl4030_vibra_remove(struct platform_device *pdev)
 
 static struct platform_driver twl4030_vibra_driver = {
         .probe          = twl4030_vibra_probe,
-        .remove         = __devexit_p(twl4030_vibra_remove),
+        .remove         = twl4030_vibra_remove,
         .driver         = {
                 .name   = "twl4030-vibra",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index c8a288ae1d5b..463e96380def 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -433,7 +433,7 @@ static int __devexit twl6040_vibra_remove(struct platform_device *pdev)
 
 static struct platform_driver twl6040_vibra_driver = {
         .probe          = twl6040_vibra_probe,
-        .remove         = __devexit_p(twl6040_vibra_remove),
+        .remove         = twl6040_vibra_remove,
         .driver         = {
                 .name   = "twl6040-vibra",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index e2bdfd4bea70..3f9ad238e4e9 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -1334,7 +1334,7 @@ static struct platform_driver wistron_driver = {
 #endif
         },
         .probe          = wistron_probe,
-        .remove         = __devexit_p(wistron_remove),
+        .remove         = wistron_remove,
 };
 
 static int __init wb_module_init(void)
diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c
index fa8b3900d981..3a12951ad7fb 100644
--- a/drivers/input/misc/wm831x-on.c
+++ b/drivers/input/misc/wm831x-on.c
@@ -138,7 +138,7 @@ static int __devexit wm831x_on_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_on_driver = {
         .probe          = wm831x_on_probe,
-        .remove         = __devexit_p(wm831x_on_remove),
+        .remove         = wm831x_on_remove,
         .driver         = {
                 .name   = "wm831x-on",
                 .owner  = THIS_MODULE,