Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / char / rio / rio_linux.c

diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 0ce96670f97994093fdc39ed84af0c5efc69d024..0cdfee152916ffb7bab395049ca69fe47baea8ab 100644 (file)
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -25,11 +25,6 @@
  *      Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
  *      USA.
  *
- * Revision history:
- * $Log: rio.c,v $
- * Revision 1.1  1999/07/11 10:13:54  wolff
- * Initial revision
- *
  * */
 
 #include <linux/module.h>
@@ -344,7 +339,7 @@ int rio_minor(struct tty_struct *tty)
 
 static int rio_set_real_termios(void *ptr)
 {
-       return RIOParam((struct Port *) ptr, CONFIG, 1, 1);
+       return RIOParam((struct Port *) ptr, RIOC_CONFIG, 1, 1);
 }
 
 
@@ -436,7 +431,7 @@ static void rio_disable_tx_interrupts(void *ptr)
 {
        func_enter();
 
-       /*  port->gs.flags &= ~GS_TX_INTEN; */
+       /*  port->gs.port.flags &= ~GS_TX_INTEN; */
 
        func_exit();
 }
@@ -460,7 +455,7 @@ static void rio_enable_tx_interrupts(void *ptr)
         * In general we cannot count on "tx empty" interrupts, although
         * the interrupt routine seems to be able to tell the difference.
         */
-       PortP->gs.flags &= ~GS_TX_INTEN;
+       PortP->gs.port.flags &= ~GS_TX_INTEN;
 
        func_exit();
 }
@@ -487,7 +482,7 @@ static int rio_get_CD(void *ptr)
        int rv;
 
        func_enter();
-       rv = (PortP->ModemState & MSVR1_CD) != 0;
+       rv = (PortP->ModemState & RIOC_MSVR1_CD) != 0;
 
        rio_dprintk(RIO_DEBUG_INIT, "Getting CD status: %d\n", rv);
 
@@ -515,7 +510,7 @@ static void rio_shutdown_port(void *ptr)
        func_enter();
 
        PortP = (struct Port *) ptr;
-       PortP->gs.tty = NULL;
+       PortP->gs.port.tty = NULL;
        func_exit();
 }
 
@@ -534,7 +529,7 @@ static void rio_hungup(void *ptr)
        func_enter();
 
        PortP = (struct Port *) ptr;
-       PortP->gs.tty = NULL;
+       PortP->gs.port.tty = NULL;
 
        func_exit();
 }
@@ -554,12 +549,12 @@ static void rio_close(void *ptr)
 
        riotclose(ptr);
 
-       if (PortP->gs.count) {
-               printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.count);
-               PortP->gs.count = 0;
+       if (PortP->gs.port.count) {
+               printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.port.count);
+               PortP->gs.port.count = 0;
        }
 
-       PortP->gs.tty = NULL;
+       PortP->gs.port.tty = NULL;
        func_exit();
 }
 
@@ -607,7 +602,8 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd
                        rio_dprintk(RIO_DEBUG_TTY, "BREAK on deleted RTA\n");
                        rc = -EIO;
                } else {
-                       if (RIOShortCommand(p, PortP, SBREAK, 2, 250) == RIO_FAIL) {
+                       if (RIOShortCommand(p, PortP, RIOC_SBREAK, 2, 250) ==
+                                       RIO_FAIL) {
                                rio_dprintk(RIO_DEBUG_INTR, "SBREAK RIOShortCommand failed\n");
                                rc = -EIO;
                        }
@@ -622,7 +618,8 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd
                        l = arg ? arg * 100 : 250;
                        if (l > 255)
                                l = 255;
-                       if (RIOShortCommand(p, PortP, SBREAK, 2, arg ? arg * 100 : 250) == RIO_FAIL) {
+                       if (RIOShortCommand(p, PortP, RIOC_SBREAK, 2,
+                                       arg ? arg * 100 : 250) == RIO_FAIL) {
                                rio_dprintk(RIO_DEBUG_INTR, "SBREAK RIOShortCommand failed\n");
                                rc = -EIO;
                        }
@@ -852,8 +849,8 @@ static int rio_init_datastructures(void)
                /*
                 * Initializing wait queue
                 */
-               init_waitqueue_head(&port->gs.open_wait);
-               init_waitqueue_head(&port->gs.close_wait);
+               init_waitqueue_head(&port->gs.port.open_wait);
+               init_waitqueue_head(&port->gs.port.close_wait);
        }
 #else
        /* We could postpone initializing them to when they are configured. */