tty: 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: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index de25774..2f4d84f 100644 (file)
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -3973,7 +3973,7 @@ static struct pci_driver cy_pci_driver = {
        .name = "cyclades",
        .id_table = cy_pci_dev_id,
        .probe = cy_pci_probe,
-       .remove = __devexit_p(cy_pci_remove)
+       .remove = cy_pci_remove
 };
 #endif
 

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 0d2ea0c..442bfb0 100644 (file)
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -239,7 +239,7 @@ static int __devexit hvc_opal_remove(struct platform_device *dev)
 
 static struct platform_driver hvc_opal_driver = {
        .probe          = hvc_opal_probe,
-       .remove         = __devexit_p(hvc_opal_remove),
+       .remove         = hvc_opal_remove,
        .driver         = {
                .name   = hvc_opal_name,
                .owner  = THIS_MODULE,

diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 744c3b8..888af58 100644 (file)
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -874,7 +874,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
 static struct vio_driver hvcs_vio_driver = {
        .id_table       = hvcs_driver_table,
        .probe          = hvcs_probe,
-       .remove         = __devexit_p(hvcs_remove),
+       .remove         = hvcs_remove,
        .name           = hvcs_driver_name,
 };
 

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 67f288d..774e595 100644 (file)
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -168,7 +168,7 @@ static struct pci_driver isicom_driver = {
        .name           = "isicom",
        .id_table       = isicom_pci_tbl,
        .probe          = isicom_probe,
-       .remove         = __devexit_p(isicom_remove)
+       .remove         = isicom_remove
 };
 
 static int prev_card = 3;      /*      start servicing isi_card[0]     */

diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index d628176..e025e06 100644 (file)
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1033,7 +1033,7 @@ static struct pci_driver moxa_pci_driver = {
        .name = "moxa",
        .id_table = moxa_pcibrds,
        .probe = moxa_pci_probe,
-       .remove = __devexit_p(moxa_pci_remove)
+       .remove = moxa_pci_remove
 };
 #endif /* CONFIG_PCI */
 

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 802a248..a2fd58c 100644 (file)
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -2677,7 +2677,7 @@ static struct pci_driver mxser_driver = {
        .name = "mxser",
        .id_table = mxser_pcibrds,
        .probe = mxser_probe,
-       .remove = __devexit_p(mxser_remove)
+       .remove = mxser_remove
 };
 
 static int __init mxser_module_init(void)

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index cb764d2..442efc3 100644 (file)
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1908,7 +1908,7 @@ static struct pci_driver nozomi_driver = {
        .name = NOZOMI_NAME,
        .id_table = nozomi_pci_tbl,
        .probe = nozomi_card_init,
-       .remove = __devexit_p(nozomi_card_exit),
+       .remove = nozomi_card_exit,
 };
 
 static __init int nozomi_init(void)

diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index e4b5c39..31db13b 100644 (file)
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -898,7 +898,7 @@ static struct pci_driver synclink_pci_driver = {
        .name           = "synclink",
        .id_table       = synclink_pci_tbl,
        .probe          = synclink_init_one,
-       .remove         = __devexit_p(synclink_remove_one),
+       .remove         = synclink_remove_one,
 };
 
 static struct tty_driver *serial_driver;

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 6e4c340..595f2f4 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -110,7 +110,7 @@ static struct pci_driver pci_driver = {
        .name           = "synclink_gt",
        .id_table       = pci_table,
        .probe          = init_one,
-       .remove         = __devexit_p(remove_one),
+       .remove         = remove_one,
 };
 
 static bool pci_registered;

diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 40745be..71f3eb2 100644 (file)
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -492,7 +492,7 @@ static struct pci_driver synclinkmp_pci_driver = {
        .name           = "synclinkmp",
        .id_table       = synclinkmp_pci_tbl,
        .probe          = synclinkmp_init_one,
-       .remove         = __devexit_p(synclinkmp_remove_one),
+       .remove         = synclinkmp_remove_one,
 };