tty: remove use of __devinit

[deliverable/linux.git] / drivers / tty / serial / 8250 / 8250_pci.c

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index cec8852dd1b6e0e3ada0b558c4bf0f7987492d0b..a5acb57b5ba032763a904bc3def0340a53e19967 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1314,7 +1314,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ite887x_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ite887x_exit),
+               .exit           = pci_ite887x_exit,
        },
        /*
         * National Instruments
@@ -1326,7 +1326,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1335,7 +1335,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1344,7 +1344,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1353,7 +1353,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1362,7 +1362,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1371,7 +1371,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1380,7 +1380,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1389,7 +1389,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1398,7 +1398,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1407,7 +1407,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1416,7 +1416,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1425,7 +1425,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8420_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_ni8420_exit),
+               .exit           = pci_ni8420_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_NI,
@@ -1434,7 +1434,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_ni8430_init,
                .setup          = pci_ni8430_setup,
-               .exit           = __devexit_p(pci_ni8430_exit),
+               .exit           = pci_ni8430_exit,
        },
        /*
         * Panacom
@@ -1446,7 +1446,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_plx9050_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_plx9050_exit),
+               .exit           = pci_plx9050_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_PANACOM,
@@ -1455,7 +1455,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_ANY_ID,
                .init           = pci_plx9050_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_plx9050_exit),
+               .exit           = pci_plx9050_exit,
        },
        /*
         * PLX
@@ -1474,7 +1474,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_EXSYS_4055,
                .init           = pci_plx9050_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_plx9050_exit),
+               .exit           = pci_plx9050_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_PLX,
@@ -1483,7 +1483,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_KEYSPAN_SX2,
                .init           = pci_plx9050_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_plx9050_exit),
+               .exit           = pci_plx9050_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_PLX,
@@ -1492,7 +1492,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_UNKNOWN_0x1584,
                .init           = pci_plx9050_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_plx9050_exit),
+               .exit           = pci_plx9050_exit,
        },
        {
                .vendor         = PCI_VENDOR_ID_PLX,
@@ -1501,7 +1501,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_DEVICE_ID_PLX_ROMULUS,
                .init           = pci_plx9050_init,
                .setup          = pci_default_setup,
-               .exit           = __devexit_p(pci_plx9050_exit),
+               .exit           = pci_plx9050_exit,
        },
        /*
         * SBS Technologies, Inc., PMC-OCTALPRO 232
@@ -1513,7 +1513,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_OCTPRO232,
                .init           = sbs_init,
                .setup          = sbs_setup,
-               .exit           = __devexit_p(sbs_exit),
+               .exit           = sbs_exit,
        },
        /*
         * SBS Technologies, Inc., PMC-OCTALPRO 422
@@ -1525,7 +1525,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_OCTPRO422,
                .init           = sbs_init,
                .setup          = sbs_setup,
-               .exit           = __devexit_p(sbs_exit),
+               .exit           = sbs_exit,
        },
        /*
         * SBS Technologies, Inc., P-Octal 232
@@ -1537,7 +1537,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_POCTAL232,
                .init           = sbs_init,
                .setup          = sbs_setup,
-               .exit           = __devexit_p(sbs_exit),
+               .exit           = sbs_exit,
        },
        /*
         * SBS Technologies, Inc., P-Octal 422
@@ -1549,7 +1549,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .subdevice      = PCI_SUBDEVICE_ID_POCTAL422,
                .init           = sbs_init,
                .setup          = sbs_setup,
-               .exit           = __devexit_p(sbs_exit),
+               .exit           = sbs_exit,
        },
        /*
         * SIIG cards - these may be called via parport_serial
@@ -2691,7 +2691,7 @@ static const struct pci_device_id blacklist[] = {
  * guess what the configuration might be, based on the pitiful PCI
  * serial specs.  Returns 0 on success, 1 on failure.
  */
-static int __devinit
+static int
 serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
 {
        const struct pci_device_id *bldev;
@@ -2917,7 +2917,7 @@ EXPORT_SYMBOL_GPL(pciserial_resume_ports);
  * Probe one serial board.  Unfortunately, there is no rhyme nor reason
  * to the arrangement of serial ports on a PCI card.
  */
-static int __devinit
+static int
 pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 {
        struct pci_serial_quirk *quirk;
@@ -4323,7 +4323,7 @@ static const struct pci_error_handlers serial8250_err_handler = {
 static struct pci_driver serial_pci_driver = {
        .name           = "serial",
        .probe          = pciserial_init_one,
-       .remove         = __devexit_p(pciserial_remove_one),
+       .remove         = pciserial_remove_one,
 #ifdef CONFIG_PM
        .suspend        = pciserial_suspend_one,
        .resume         = pciserial_resume_one,
@@ -4332,18 +4332,7 @@ static struct pci_driver serial_pci_driver = {
        .err_handler    = &serial8250_err_handler,
 };
 
-static int __init serial8250_pci_init(void)
-{
-       return pci_register_driver(&serial_pci_driver);
-}
-
-static void __exit serial8250_pci_exit(void)
-{
-       pci_unregister_driver(&serial_pci_driver);
-}
-
-module_init(serial8250_pci_init);
-module_exit(serial8250_pci_exit);
+module_pci_driver(serial_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Generic 8250/16x50 PCI serial probe module");