1 files changed, 44 insertions, 49 deletions

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 56cbba7b6ec0..d83419c3857e 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -84,6 +84,7 @@
 #include <linux/mutex.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
+#include <linux/completion.h>
 #include <linux/wait.h>
 #include <linux/pci.h>
 #include <asm/uaccess.h>
@@ -548,8 +549,8 @@ static void rp_handle_port(struct r_port *info)
 static void rp_do_poll(unsigned long dummy)
 {
         CONTROLLER_t *ctlp;
-        int ctrl, aiop, ch, line, i;
-        unsigned int xmitmask;
+        int ctrl, aiop, ch, line;
+        unsigned int xmitmask, i;
         unsigned int CtlMask;
         unsigned char AiopMask;
         Word_t bit;
@@ -562,7 +563,7 @@ static void rp_do_poll(unsigned long dummy)
                 /*  Get a ptr to the board's control struct */
                 ctlp = sCtlNumToCtlPtr(ctrl);
 
-                /*  Get the interupt status from the board */
+                /*  Get the interrupt status from the board */
 #ifdef CONFIG_PCI
                 if (ctlp->BusType == isPCI)
                         CtlMask = sPCIGetControllerIntStatus(ctlp);
@@ -650,7 +651,7 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         info->closing_wait = 3000;
         info->close_delay = 50;
         init_waitqueue_head(&info->open_wait);
-        init_waitqueue_head(&info->close_wait);
+        init_completion(&info->close_wait);
         info->flags &= ~ROCKET_MODE_MASK;
         switch (pc104[board][line]) {
         case 422:
@@ -699,8 +700,8 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         spin_lock_init(&info->slock);
         mutex_init(&info->write_mtx);
         rp_table[line] = info;
-        if (pci_dev)
-                tty_register_device(rocket_driver, line, &pci_dev->dev);
+        tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
+                        NULL);
 }
 
 /*
@@ -878,7 +879,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         if (tty_hung_up_p(filp))
                 return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
         if (info->flags & ROCKET_CLOSING) {
-                interruptible_sleep_on(&info->close_wait);
+                if (wait_for_completion_interruptible(&info->close_wait))
+                        return -ERESTARTSYS;
                 return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
         }
 
@@ -983,8 +985,10 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                 return -ENOMEM;
 
         if (info->flags & ROCKET_CLOSING) {
-                interruptible_sleep_on(&info->close_wait);
+                retval = wait_for_completion_interruptible(&info->close_wait);
                 free_page(page);
+                if (retval)
+                        return retval;
                 return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
         }
 
@@ -1176,7 +1180,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
         }
         info->flags &= ~(ROCKET_INITIALIZED | ROCKET_CLOSING | ROCKET_NORMAL_ACTIVE);
         tty->closing = 0;
-        wake_up_interruptible(&info->close_wait);
+        complete_all(&info->close_wait);
         atomic_dec(&rp_num_ports_open);
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -1869,8 +1873,6 @@ static __init int register_PCI(int i, struct pci_dev *dev)
         int fast_clock = 0;
         int altChanRingIndicator = 0;
         int ports_per_aiop = 8;
-        int ret;
-        unsigned int class_rev;
         WordIO_t ConfigIO = 0;
         ByteIO_t UPCIRingInd = 0;
 
@@ -1878,12 +1880,6 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                 return 0;
 
         rcktpt_io_addr[i] = pci_resource_start(dev, 0);
-        ret = pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
-
-        if (ret) {
-                printk(KERN_INFO "  Error during register_PCI(), unable to read config dword \n");
-                return 0;
-        }
 
         rcktpt_type[i] = ROCKET_TYPE_NORMAL;
         rocketModel[i].loadrm2 = 0;
@@ -2037,8 +2033,9 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                 ports_per_aiop = 6;
                 str = "6-port";
 
-                /*  If class_rev is 1, the rocketmodem flash must be loaded.  If it is 2 it is a "socketed" version. */
-                if ((class_rev & 0xFF) == 1) {
+                /*  If revision is 1, the rocketmodem flash must be loaded.
+                 *  If it is 2 it is a "socketed" version. */
+                if (dev->revision == 1) {
                         rcktpt_type[i] = ROCKET_TYPE_MODEMII;
                         rocketModel[i].loadrm2 = 1;
                 } else {
@@ -2053,7 +2050,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                 max_num_aiops = 1;
                 ports_per_aiop = 4;
                 str = "4-port";
-                if ((class_rev & 0xFF) == 1) {
+                if (dev->revision == 1) {
                         rcktpt_type[i] = ROCKET_TYPE_MODEMII;
                         rocketModel[i].loadrm2 = 1;
                 } else {
@@ -2362,26 +2359,14 @@ static const struct tty_operations rocket_ops = {
  */
 static int __init rp_init(void)
 {
-        int retval, pci_boards_found, isa_boards_found, i;
+        int ret = -ENOMEM, pci_boards_found, isa_boards_found, i;
 
         printk(KERN_INFO "RocketPort device driver module, version %s, %s\n",
                ROCKET_VERSION, ROCKET_DATE);
 
         rocket_driver = alloc_tty_driver(MAX_RP_PORTS);
         if (!rocket_driver)
-                return -ENOMEM;
-
-        /*
-         * Initialize the array of pointers to our own internal state
-         * structures.
-         */
-        memset(rp_table, 0, sizeof (rp_table));
-        memset(xmit_flags, 0, sizeof (xmit_flags));
-
-        for (i = 0; i < MAX_RP_PORTS; i++)
-                lineNumbers[i] = 0;
-        nextLineNumber = 0;
-        memset(rocketModel, 0, sizeof (rocketModel));
+                goto err;
 
         /*
          *  If board 1 is non-zero, there is at least one ISA configured.  If controller is 
@@ -2396,8 +2381,11 @@ static int __init rp_init(void)
 
         /*  If an ISA card is configured, reserve the 4 byte IO space for the Mudbac controller */
         if (controller && (!request_region(controller, 4, "Comtrol RocketPort"))) {
-                printk(KERN_INFO "Unable to reserve IO region for first configured ISA RocketPort controller 0x%lx.  Driver exiting \n", controller);
-                return -EBUSY;
+                printk(KERN_ERR "Unable to reserve IO region for first "
+                        "configured ISA RocketPort controller 0x%lx.  "
+                        "Driver exiting\n", controller);
+                ret = -EBUSY;
+                goto err_tty;
         }
 
         /*  Store ISA variable retrieved from command line or .conf file. */
@@ -2434,15 +2422,14 @@ static int __init rp_init(void)
         rocket_driver->init_termios.c_ispeed = 9600;
         rocket_driver->init_termios.c_ospeed = 9600;
 #ifdef ROCKET_SOFT_FLOW
-        rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        rocket_driver->flags |= TTY_DRIVER_REAL_RAW;
 #endif
         tty_set_operations(rocket_driver, &rocket_ops);
 
-        retval = tty_register_driver(rocket_driver);
-        if (retval < 0) {
-                printk(KERN_INFO "Couldn't install tty RocketPort driver (error %d)\n", -retval);
-                put_tty_driver(rocket_driver);
-                return -1;
+        ret = tty_register_driver(rocket_driver);
+        if (ret < 0) {
+                printk(KERN_ERR "Couldn't install tty RocketPort driver\n");
+                goto err_tty;
         }
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -2469,14 +2456,18 @@ static int __init rp_init(void)
         max_board = pci_boards_found + isa_boards_found;
 
         if (max_board == 0) {
-                printk(KERN_INFO "No rocketport ports found; unloading driver.\n");
-                del_timer_sync(&rocket_timer);
-                tty_unregister_driver(rocket_driver);
-                put_tty_driver(rocket_driver);
-                return -ENXIO;
+                printk(KERN_ERR "No rocketport ports found; unloading driver\n");
+                ret = -ENXIO;
+                goto err_ttyu;
         }
 
         return 0;
+err_ttyu:
+        tty_unregister_driver(rocket_driver);
+err_tty:
+        put_tty_driver(rocket_driver);
+err:
+        return ret;
 }
 
 
@@ -2491,10 +2482,14 @@ static void rp_cleanup_module(void)
         if (retval)
                 printk(KERN_INFO "Error %d while trying to unregister "
                        "rocketport driver\n", -retval);
-        put_tty_driver(rocket_driver);
 
         for (i = 0; i < MAX_RP_PORTS; i++)
-                kfree(rp_table[i]);
+                if (rp_table[i]) {
+                        tty_unregister_device(rocket_driver, i);
+                        kfree(rp_table[i]);
+                }
+
+        put_tty_driver(rocket_driver);
 
         for (i = 0; i < NUM_BOARDS; i++) {
                 if (rcktpt_io_addr[i] <= 0 || is_PCI[i])