39 files changed, 39 insertions, 39 deletions

diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c
index 326218dbd6e6..e609db85bea1 100644
--- a/drivers/input/touchscreen/88pm860x-ts.c
+++ b/drivers/input/touchscreen/88pm860x-ts.c
@@ -310,7 +310,7 @@ static struct platform_driver pm860x_touch_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = pm860x_touch_probe,
-        .remove = __devexit_p(pm860x_touch_remove),
+        .remove = pm860x_touch_remove,
 };
 module_platform_driver(pm860x_touch_driver);
 
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 2c7692108e6c..d2df6a48ba65 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -857,7 +857,7 @@ static struct spi_driver ad7877_driver = {
                 .pm     = &ad7877_pm,
         },
         .probe          = ad7877_probe,
-        .remove         = __devexit_p(ad7877_remove),
+        .remove         = ad7877_remove,
 };
 
 module_spi_driver(ad7877_driver);
diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c
index 3054354d0dd3..850c95d69198 100644
--- a/drivers/input/touchscreen/ad7879-i2c.c
+++ b/drivers/input/touchscreen/ad7879-i2c.c
@@ -98,7 +98,7 @@ static struct i2c_driver ad7879_i2c_driver = {
                 .pm     = &ad7879_pm_ops,
         },
         .probe          = ad7879_i2c_probe,
-        .remove         = __devexit_p(ad7879_i2c_remove),
+        .remove         = ad7879_i2c_remove,
         .id_table       = ad7879_id,
 };
 
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index db49abf056ba..86b0fdb6046b 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -154,7 +154,7 @@ static struct spi_driver ad7879_spi_driver = {
                 .pm     = &ad7879_pm_ops,
         },
         .probe          = ad7879_spi_probe,
-        .remove         = __devexit_p(ad7879_spi_remove),
+        .remove         = ad7879_spi_remove,
 };
 
 module_spi_driver(ad7879_spi_driver);
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 78e5d9ab0ba7..560484de0bfb 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1434,7 +1434,7 @@ static struct spi_driver ads7846_driver = {
                 .pm     = &ads7846_pm,
         },
         .probe          = ads7846_probe,
-        .remove         = __devexit_p(ads7846_remove),
+        .remove         = ads7846_remove,
 };
 
 module_spi_driver(ads7846_driver);
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 1df2396af008..6199303d9d3c 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1270,7 +1270,7 @@ static struct i2c_driver mxt_driver = {
                 .pm     = &mxt_pm_ops,
         },
         .probe          = mxt_probe,
-        .remove         = __devexit_p(mxt_remove),
+        .remove         = mxt_remove,
         .id_table       = mxt_id,
 };
 
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
index 201b2d2ec1b3..53712b9142a5 100644
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -346,7 +346,7 @@ static int __devexit atmel_tsadcc_remove(struct platform_device *pdev)
 
 static struct platform_driver atmel_tsadcc_driver = {
         .probe          = atmel_tsadcc_probe,
-        .remove         = __devexit_p(atmel_tsadcc_remove),
+        .remove         = atmel_tsadcc_remove,
         .driver         = {
                 .name   = "atmel_tsadcc",
         },
diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c
index c7047b6bb020..912926dd97c0 100644
--- a/drivers/input/touchscreen/auo-pixcir-ts.c
+++ b/drivers/input/touchscreen/auo-pixcir-ts.c
@@ -631,7 +631,7 @@ static struct i2c_driver auo_pixcir_driver = {
                 .pm     = &auo_pixcir_pm_ops,
         },
         .probe          = auo_pixcir_probe,
-        .remove         = __devexit_p(auo_pixcir_remove),
+        .remove         = auo_pixcir_remove,
         .id_table       = auo_pixcir_idtable,
 };
 
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index 5c487d23f11c..c2be1fe51923 100644
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -649,7 +649,7 @@ static struct i2c_driver bu21013_driver = {
 #endif
         },
         .probe          =       bu21013_probe,
-        .remove         =       __devexit_p(bu21013_remove),
+        .remove         =       bu21013_remove,
         .id_table       =       bu21013_id,
 };
 
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c
index ad6a6640f385..9a2044f978ae 100644
--- a/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -357,7 +357,7 @@ static struct i2c_driver cy8ctmg110_driver = {
         },
         .id_table       = cy8ctmg110_idtable,
         .probe          = cy8ctmg110_probe,
-        .remove         = __devexit_p(cy8ctmg110_remove),
+        .remove         = cy8ctmg110_remove,
 };
 
 module_i2c_driver(cy8ctmg110_driver);
diff --git a/drivers/input/touchscreen/cyttsp_i2c.c b/drivers/input/touchscreen/cyttsp_i2c.c
index 2af1d0c52bcd..1a7aca935b26 100644
--- a/drivers/input/touchscreen/cyttsp_i2c.c
+++ b/drivers/input/touchscreen/cyttsp_i2c.c
@@ -124,7 +124,7 @@ static struct i2c_driver cyttsp_i2c_driver = {
                 .pm     = &cyttsp_pm_ops,
         },
         .probe          = cyttsp_i2c_probe,
-        .remove         = __devexit_p(cyttsp_i2c_remove),
+        .remove         = cyttsp_i2c_remove,
         .id_table       = cyttsp_i2c_id,
 };
 
diff --git a/drivers/input/touchscreen/cyttsp_spi.c b/drivers/input/touchscreen/cyttsp_spi.c
index 9f263410407b..915af4cfe2b2 100644
--- a/drivers/input/touchscreen/cyttsp_spi.c
+++ b/drivers/input/touchscreen/cyttsp_spi.c
@@ -188,7 +188,7 @@ static struct spi_driver cyttsp_spi_driver = {
                 .pm     = &cyttsp_pm_ops,
         },
         .probe  = cyttsp_spi_probe,
-        .remove = __devexit_p(cyttsp_spi_remove),
+        .remove = cyttsp_spi_remove,
 };
 
 module_spi_driver(cyttsp_spi_driver);
diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c
index 36b65cf10d7f..ec156a6bf59d 100644
--- a/drivers/input/touchscreen/da9034-ts.c
+++ b/drivers/input/touchscreen/da9034-ts.c
@@ -377,7 +377,7 @@ static struct platform_driver da9034_touch_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = da9034_touch_probe,
-        .remove         = __devexit_p(da9034_touch_remove),
+        .remove         = da9034_touch_remove,
 };
 module_platform_driver(da9034_touch_driver);
 
diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c
index e8df341090c0..5dfb39b21c90 100644
--- a/drivers/input/touchscreen/da9052_tsi.c
+++ b/drivers/input/touchscreen/da9052_tsi.c
@@ -355,7 +355,7 @@ static int  __devexit da9052_ts_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_tsi_driver = {
         .probe  = da9052_ts_probe,
-        .remove = __devexit_p(da9052_ts_remove),
+        .remove = da9052_ts_remove,
         .driver = {
                 .name   = "da9052-tsi",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index d9c6007e445f..65ed9d958e5f 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -883,7 +883,7 @@ static struct i2c_driver edt_ft5x06_ts_driver = {
         },
         .id_table = edt_ft5x06_ts_id,
         .probe    = edt_ft5x06_ts_probe,
-        .remove   = __devexit_p(edt_ft5x06_ts_remove),
+        .remove   = edt_ft5x06_ts_remove,
 };
 
 module_i2c_driver(edt_ft5x06_ts_driver);
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
index 908407efc672..a2d9a65e586d 100644
--- a/drivers/input/touchscreen/eeti_ts.c
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -321,7 +321,7 @@ static struct i2c_driver eeti_ts_driver = {
 #endif
         },
         .probe = eeti_ts_probe,
-        .remove = __devexit_p(eeti_ts_remove),
+        .remove = eeti_ts_remove,
         .id_table = eeti_ts_id,
 };
 
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
index 13fa62fdfb0b..d85078d06497 100644
--- a/drivers/input/touchscreen/egalax_ts.c
+++ b/drivers/input/touchscreen/egalax_ts.c
@@ -301,7 +301,7 @@ static struct i2c_driver egalax_ts_driver = {
         },
         .id_table       = egalax_ts_id,
         .probe          = egalax_ts_probe,
-        .remove         = __devexit_p(egalax_ts_remove),
+        .remove         = egalax_ts_remove,
 };
 
 module_i2c_driver(egalax_ts_driver);
diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
index d13143b68b3e..5cc3240139ec 100644
--- a/drivers/input/touchscreen/htcpen.c
+++ b/drivers/input/touchscreen/htcpen.c
@@ -210,7 +210,7 @@ static int htcpen_isa_resume(struct device *dev, unsigned int n)
 
 static struct isa_driver htcpen_isa_driver = {
         .probe          = htcpen_isa_probe,
-        .remove         = __devexit_p(htcpen_isa_remove),
+        .remove         = htcpen_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = htcpen_isa_suspend,
         .resume         = htcpen_isa_resume,
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 4ac69760ec08..e8fd6c26b76c 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -350,7 +350,7 @@ static struct i2c_driver ili210x_ts_driver = {
         },
         .id_table = ili210x_i2c_id,
         .probe = ili210x_i2c_probe,
-        .remove = __devexit_p(ili210x_i2c_remove),
+        .remove = ili210x_i2c_remove,
 };
 
 module_i2c_driver(ili210x_ts_driver);
diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c
index cf299377fc49..f27364f7ad11 100644
--- a/drivers/input/touchscreen/intel-mid-touch.c
+++ b/drivers/input/touchscreen/intel-mid-touch.c
@@ -662,7 +662,7 @@ static struct platform_driver mrstouch_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = mrstouch_probe,
-        .remove         = __devexit_p(mrstouch_remove),
+        .remove         = mrstouch_remove,
 };
 module_platform_driver(mrstouch_driver);
 
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index 7f03d1bd916e..ad35c8ceac26 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -168,7 +168,7 @@ MODULE_ALIAS("platform:jornada_ts");
 
 static struct platform_driver jornada720_ts_driver = {
         .probe          = jornada720_ts_probe,
-        .remove         = __devexit_p(jornada720_ts_remove),
+        .remove         = jornada720_ts_remove,
         .driver         = {
                 .name   = "jornada_ts",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/touchscreen/lpc32xx_ts.c b/drivers/input/touchscreen/lpc32xx_ts.c
index 4c2b8ed3bf16..8134f6100de0 100644
--- a/drivers/input/touchscreen/lpc32xx_ts.c
+++ b/drivers/input/touchscreen/lpc32xx_ts.c
@@ -394,7 +394,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_tsc_of_match);
 
 static struct platform_driver lpc32xx_ts_driver = {
         .probe          = lpc32xx_ts_probe,
-        .remove         = __devexit_p(lpc32xx_ts_remove),
+        .remove         = lpc32xx_ts_remove,
         .driver         = {
                 .name   = MOD_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/touchscreen/max11801_ts.c b/drivers/input/touchscreen/max11801_ts.c
index 4eab50b856d7..e3e637f01609 100644
--- a/drivers/input/touchscreen/max11801_ts.c
+++ b/drivers/input/touchscreen/max11801_ts.c
@@ -252,7 +252,7 @@ static struct i2c_driver max11801_ts_driver = {
         },
         .id_table       = max11801_ts_id,
         .probe          = max11801_ts_probe,
-        .remove         = __devexit_p(max11801_ts_remove),
+        .remove         = max11801_ts_remove,
 };
 
 module_i2c_driver(max11801_ts_driver);
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index 48dc5b0d26f1..5c18c5cb9f7a 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -243,7 +243,7 @@ static int __devexit mc13783_ts_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver mc13783_ts_driver = {
-        .remove         = __devexit_p(mc13783_ts_remove),
+        .remove         = mc13783_ts_remove,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = MC13783_TS_NAME,
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index b528511861ce..94a4ff6de3f9 100644
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -292,7 +292,7 @@ MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id);
 
 static struct i2c_driver mcs5000_ts_driver = {
         .probe          = mcs5000_ts_probe,
-        .remove         = __devexit_p(mcs5000_ts_remove),
+        .remove         = mcs5000_ts_remove,
         .driver = {
                 .name = "mcs5000_ts",
 #ifdef CONFIG_PM
diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c
index 3426d2e11a36..f4c1bc8a5a8d 100644
--- a/drivers/input/touchscreen/mms114.c
+++ b/drivers/input/touchscreen/mms114.c
@@ -590,7 +590,7 @@ static struct i2c_driver mms114_driver = {
                 .of_match_table = of_match_ptr(mms114_dt_match),
         },
         .probe          = mms114_probe,
-        .remove         = __devexit_p(mms114_remove),
+        .remove         = mms114_remove,
         .id_table       = mms114_id,
 };
 
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c
index f57aeb80f7e3..97f07baa6e8f 100644
--- a/drivers/input/touchscreen/pcap_ts.c
+++ b/drivers/input/touchscreen/pcap_ts.c
@@ -245,7 +245,7 @@ static const struct dev_pm_ops pcap_ts_pm_ops = {
 
 static struct platform_driver pcap_ts_driver = {
         .probe          = pcap_ts_probe,
-        .remove         = __devexit_p(pcap_ts_remove),
+        .remove         = pcap_ts_remove,
         .driver         = {
                 .name   = "pcap-ts",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 953b4c105cad..4fcb63e4337b 100644
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -218,7 +218,7 @@ static struct i2c_driver pixcir_i2c_ts_driver = {
                 .pm     = &pixcir_dev_pm_ops,
         },
         .probe          = pixcir_i2c_ts_probe,
-        .remove         = __devexit_p(pixcir_i2c_ts_remove),
+        .remove         = pixcir_i2c_ts_remove,
         .id_table       = pixcir_i2c_ts_id,
 };
 
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 549fa29548f8..4dda7656e077 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -430,7 +430,7 @@ static struct platform_driver s3c_ts_driver = {
         },
         .id_table       = s3cts_driver_ids,
         .probe          = s3c2410ts_probe,
-        .remove         = __devexit_p(s3c2410ts_remove),
+        .remove         = s3c2410ts_remove,
 };
 module_platform_driver(s3c_ts_driver);
 
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index 6cb68a1981bf..62a4b5d71643 100644
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -264,7 +264,7 @@ MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
 
 static struct i2c_driver st1232_ts_driver = {
         .probe          = st1232_ts_probe,
-        .remove         = __devexit_p(st1232_ts_remove),
+        .remove         = st1232_ts_remove,
         .id_table       = st1232_ts_id,
         .driver = {
                 .name   = ST1232_TS_NAME,
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 43e796747f4b..f4897545ec6c 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -386,7 +386,7 @@ static struct platform_driver stmpe_ts_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = stmpe_input_probe,
-        .remove = __devexit_p(stmpe_ts_remove),
+        .remove = stmpe_ts_remove,
 };
 module_platform_driver(stmpe_ts_driver);
 
diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c
index 368d2c6cf780..62d57e8d49fe 100644
--- a/drivers/input/touchscreen/tnetv107x-ts.c
+++ b/drivers/input/touchscreen/tnetv107x-ts.c
@@ -374,7 +374,7 @@ static int __devexit tsc_remove(struct platform_device *pdev)
 
 static struct platform_driver tsc_driver = {
         .probe          = tsc_probe,
-        .remove         = __devexit_p(tsc_remove),
+        .remove         = tsc_remove,
         .driver.name    = "tnetv107x-ts",
         .driver.owner   = THIS_MODULE,
 };
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index f7eda3d00fad..e1ec9e074ed3 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -367,7 +367,7 @@ static struct platform_driver tps6507x_ts_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps6507x_ts_probe,
-        .remove = __devexit_p(tps6507x_ts_remove),
+        .remove = tps6507x_ts_remove,
 };
 module_platform_driver(tps6507x_ts_driver);
 
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 5ce3fa8ce646..db472a80bcb2 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -745,7 +745,7 @@ static struct spi_driver tsc2005_driver = {
                 .pm     = &tsc2005_pm_ops,
         },
         .probe  = tsc2005_probe,
-        .remove = __devexit_p(tsc2005_remove),
+        .remove = tsc2005_remove,
 };
 
 module_spi_driver(tsc2005_driver);
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 1473d2382afd..3b195835cb03 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -396,7 +396,7 @@ static struct i2c_driver tsc2007_driver = {
         },
         .id_table       = tsc2007_idtable,
         .probe          = tsc2007_probe,
-        .remove         = __devexit_p(tsc2007_remove),
+        .remove         = tsc2007_remove,
 };
 
 module_i2c_driver(tsc2007_driver);
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 46e83ad53f43..780eda612547 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -442,7 +442,7 @@ static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops,
 
 static struct platform_driver ucb1400_ts_driver = {
         .probe  = ucb1400_ts_probe,
-        .remove = __devexit_p(ucb1400_ts_remove),
+        .remove = ucb1400_ts_remove,
         .driver = {
                 .name   = "ucb1400_ts",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
index 9396b21d0e8f..039e4eadb6ac 100644
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -325,7 +325,7 @@ static int __devexit w90x900ts_remove(struct platform_device *pdev)
 
 static struct platform_driver w90x900ts_driver = {
         .probe          = w90x900ts_probe,
-        .remove         = __devexit_p(w90x900ts_remove),
+        .remove         = w90x900ts_remove,
         .driver         = {
                 .name   = "nuc900-ts",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 0c01657132fd..0c033dfbd73e 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -272,7 +272,7 @@ static struct i2c_driver wacom_i2c_driver = {
         },
 
         .probe          = wacom_i2c_probe,
-        .remove         = __devexit_p(wacom_i2c_remove),
+        .remove         = wacom_i2c_remove,
         .id_table       = wacom_i2c_id,
 };
 module_i2c_driver(wacom_i2c_driver);
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index c7eee56d0087..17f14b69438a 100644
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -398,7 +398,7 @@ static struct platform_driver wm831x_ts_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = wm831x_ts_probe,
-        .remove = __devexit_p(wm831x_ts_remove),
+        .remove = wm831x_ts_remove,
 };
 module_platform_driver(wm831x_ts_driver);