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>

13 files changed, 13 insertions, 13 deletions

diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index cc11f4efe119..50da8e5634c3 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -187,7 +187,7 @@ MODULE_DEVICE_TABLE(of, altera_ps2_match);
  */
 static struct platform_driver altera_ps2_driver = {
         .probe          = altera_ps2_probe,
-        .remove         = __devexit_p(altera_ps2_remove),
+        .remove         = altera_ps2_remove,
         .driver = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 2e77246c2e5a..beb08160b39e 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -204,7 +204,7 @@ static struct amba_driver ambakmi_driver = {
         },
         .id_table       = amba_kmi_idtable,
         .probe          = amba_kmi_probe,
-        .remove         = __devexit_p(amba_kmi_remove),
+        .remove         = amba_kmi_remove,
         .resume         = amba_kmi_resume,
 };
 
diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
index 89ad7631848e..72fda8ff4e10 100644
--- a/drivers/input/serio/arc_ps2.c
+++ b/drivers/input/serio/arc_ps2.c
@@ -264,7 +264,7 @@ static struct platform_driver arc_ps2_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = arc_ps2_probe,
-        .remove = __devexit_p(arc_ps2_remove),
+        .remove = arc_ps2_remove,
 };
 
 module_platform_driver(arc_ps2_driver);
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index 852816567241..64bcd1559c68 100644
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -212,7 +212,7 @@ static struct platform_driver ct82c710_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ct82c710_probe,
-        .remove         = __devexit_p(ct82c710_remove),
+        .remove         = ct82c710_remove,
 };
 
 
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 4225f5d6b15f..49cb7ca55ff6 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -444,7 +444,7 @@ static struct parisc_driver parisc_ps2_driver = {
         .name           = "gsc_ps2",
         .id_table       = gscps2_device_tbl,
         .probe          = gscps2_probe,
-        .remove         = __devexit_p(gscps2_remove),
+        .remove         = gscps2_remove,
 };
 
 static int __init gscps2_init(void)
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index 395a9af3adcd..3f6c835ae005 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -102,7 +102,7 @@ static struct platform_driver sparc_i8042_driver = {
                 .of_match_table = sparc_i8042_match,
         },
         .probe          = sparc_i8042_probe,
-        .remove         = __devexit_p(sparc_i8042_remove),
+        .remove         = sparc_i8042_remove,
 };
 
 static int __init i8042_platform_init(void)
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 86564414b75a..2539195729bd 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1455,7 +1455,7 @@ static struct platform_driver i8042_driver = {
                 .pm     = &i8042_pm_ops,
 #endif
         },
-        .remove         = __devexit_p(i8042_remove),
+        .remove         = i8042_remove,
         .shutdown       = i8042_shutdown,
 };
 
diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index 61da763b1209..2226277089db 100644
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -165,7 +165,7 @@ static struct platform_driver maceps2_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = maceps2_probe,
-        .remove         = __devexit_p(maceps2_remove),
+        .remove         = maceps2_remove,
 };
 
 static int __init maceps2_init(void)
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index 0c42497aaaf4..98093731ae62 100644
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -212,7 +212,7 @@ static struct pci_driver pcips2_driver = {
         .name                   = "pcips2",
         .id_table               = pcips2_ids,
         .probe                  = pcips2_probe,
-        .remove                 = __devexit_p(pcips2_remove),
+        .remove                 = pcips2_remove,
 };
 
 module_pci_driver(pcips2_driver);
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index 0c0df7f73802..530488006105 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -190,7 +190,7 @@ static struct platform_driver q40kbd_driver = {
                 .name   = "q40kbd",
                 .owner  = THIS_MODULE,
         },
-        .remove         = __devexit_p(q40kbd_remove),
+        .remove         = q40kbd_remove,
 };
 
 static int __init q40kbd_init(void)
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 2af5df6a8fba..a5100d455e30 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -166,7 +166,7 @@ static int __devexit rpckbd_remove(struct platform_device *dev)
 
 static struct platform_driver rpckbd_driver = {
         .probe          = rpckbd_probe,
-        .remove         = __devexit_p(rpckbd_remove),
+        .remove         = rpckbd_remove,
         .driver         = {
                 .name   = "kart",
                 .owner  = THIS_MODULE,
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 389766707534..4aacf4f94e3e 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -357,7 +357,7 @@ static struct sa1111_driver ps2_driver = {
         },
         .devid          = SA1111_DEVID_PS2,
         .probe          = ps2_probe,
-        .remove         = __devexit_p(ps2_remove),
+        .remove         = ps2_remove,
 };
 
 static int __init ps2_init(void)
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 1e983bec7d86..73f90dd8eee6 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -368,7 +368,7 @@ static struct platform_driver xps2_of_driver = {
                 .of_match_table = xps2_of_match,
         },
         .probe          = xps2_of_probe,
-        .remove         = __devexit_p(xps2_of_remove),
+        .remove         = xps2_of_remove,
 };
 module_platform_driver(xps2_of_driver);