tty: remove use of __devinit

[deliverable/linux.git] / drivers / tty / synclinkmp.c

diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index f17d9f3d84a2e80c512fbfac0e8cd634485b5fa4..d301110b4d1ae6cc7701fba492a93061382034a1 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,
 };
 
 
@@ -3843,8 +3843,10 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
        for ( port = 0; port < SCA_MAX_PORTS; ++port ) {
                port_array[port] = alloc_dev(adapter_num,port,pdev);
                if( port_array[port] == NULL ) {
-                       for ( --port; port >= 0; --port )
+                       for (--port; port >= 0; --port) {
+                               tty_port_destroy(&port_array[port]->port);
                                kfree(port_array[port]);
+                       }
                        return;
                }
        }
@@ -3953,6 +3955,7 @@ static void synclinkmp_cleanup(void)
                }
                tmp = info;
                info = info->next_device;
+               tty_port_destroy(&tmp->port);
                kfree(tmp);
        }
 
@@ -5592,7 +5595,7 @@ static void write_control_reg(SLMP_INFO * info)
 }
 
 
-static int __devinit synclinkmp_init_one (struct pci_dev *dev,
+static int synclinkmp_init_one (struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
        if (pci_enable_device(dev)) {