m68k: gs: use tty_port fixes

commit b5391e29f428d11755ca2c91074c6db6f5c69d7c ("gs: use tty_port")
forgot to update the m68k gs serial drivers.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/char/ser_a2232.c b/drivers/char/ser_a2232.c
index 4ba3aec9e1cd..7b0c35207d9b 100644
--- a/drivers/char/ser_a2232.c
+++ b/drivers/char/ser_a2232.c
@@ -192,7 +192,7 @@ static inline void a2232_receive_char(struct a2232_port *port, int ch, int err)
         Maybe one could implement a more efficient version by not only
         transferring one character at a time.
 */
-        struct tty_struct *tty = port->gs.tty;
+        struct tty_struct *tty = port->gs.port.tty;
 
 #if 0
         switch(err) {
@@ -226,7 +226,7 @@ static void a2232_disable_tx_interrupts(void *ptr)
 
         /* Does this here really have to be? */
         local_irq_save(flags);
-        port->gs.flags &= ~GS_TX_INTEN;
+        port->gs.port.flags &= ~GS_TX_INTEN;
         local_irq_restore(flags);
 }
 
@@ -242,7 +242,7 @@ static void a2232_enable_tx_interrupts(void *ptr)
 
         /* Does this here really have to be? */
         local_irq_save(flags);
-        port->gs.flags |= GS_TX_INTEN;
+        port->gs.port.flags |= GS_TX_INTEN;
         local_irq_restore(flags);
 }
 
@@ -276,9 +276,9 @@ static void a2232_shutdown_port(void *ptr)
 
         local_irq_save(flags);
 
-        port->gs.flags &= ~GS_ACTIVE;
+        port->gs.port.flags &= ~GS_ACTIVE;
         
-        if (port->gs.tty && port->gs.tty->termios->c_cflag & HUPCL) {
+        if (port->gs.port.tty && port->gs.port.tty->termios->c_cflag & HUPCL) {
                 /* Set DTR and RTS to Low, flush output.
                    The NetBSD driver "msc.c" does it this way. */
                 stat->Command = (       (stat->Command & ~A2232CMD_CMask) | 
@@ -309,7 +309,7 @@ static int  a2232_set_real_termios(void *ptr)
         volatile struct a2232status *status;
         volatile struct a2232memory *mem;
 
-        if (!port->gs.tty || !port->gs.tty->termios) return 0;
+        if (!port->gs.port.tty || !port->gs.port.tty->termios) return 0;
 
         status = a2232stat(port->which_a2232, port->which_port_on_a2232);
         mem = a2232mem(port->which_a2232);
@@ -345,7 +345,7 @@ static int  a2232_set_real_termios(void *ptr)
         }
         a2232_param |= rate;
 
-        cflag  = port->gs.tty->termios->c_cflag;
+        cflag  = port->gs.port.tty->termios->c_cflag;
 
         // get character size
         chsize = cflag & CSIZE;
@@ -382,7 +382,7 @@ static int  a2232_set_real_termios(void *ptr)
                 the conventional way of inserting START/STOP characters
                 by hand in throttle()/unthrottle().
         */
-        softflow = !!( port->gs.tty->termios->c_iflag & IXOFF );
+        softflow = !!( port->gs.port.tty->termios->c_iflag & IXOFF );
 
         // get Parity (Enabled/Disabled? If Enabled, Odd or Even?)
         parity = cflag & (PARENB | PARODD);
@@ -400,9 +400,9 @@ static int  a2232_set_real_termios(void *ptr)
         /*      Hmm. Maybe an own a2232_port structure
                 member would be cleaner?        */
         if (cflag & CLOCAL)
-                port->gs.flags &= ~ASYNC_CHECK_CD;
+                port->gs.port.flags &= ~ASYNC_CHECK_CD;
         else
-                port->gs.flags |= ASYNC_CHECK_CD;
+                port->gs.port.flags |= ASYNC_CHECK_CD;
 
 
         /* Now we have all parameters and can go to set them: */
@@ -482,18 +482,18 @@ static int  a2232_open(struct tty_struct * tty, struct file * filp)
         port = &a2232_ports[line];
         
         tty->driver_data = port;
-        port->gs.tty = tty;
-        port->gs.count++;
+        port->gs.port.tty = tty;
+        port->gs.port.count++;
         retval = gs_init_port(&port->gs);
         if (retval) {
-                port->gs.count--;
+                port->gs.port.count--;
                 return retval;
         }
-        port->gs.flags |= GS_ACTIVE;
+        port->gs.port.flags |= GS_ACTIVE;
         retval = gs_block_til_ready(port, filp);
 
         if (retval) {
-                port->gs.count--;
+                port->gs.port.count--;
                 return retval;
         }
 
@@ -522,7 +522,7 @@ int ch, err, n, p;
                 for (p = 0; p < NUMLINES; p++){ /* for every port on this board */
                         err = 0;
                         port = &a2232_ports[n*NUMLINES+p];
-                        if ( port->gs.flags & GS_ACTIVE ){ /* if the port is used */
+                        if ( port->gs.port.flags & GS_ACTIVE ){ /* if the port is used */
 
                                 status = a2232stat(n,p);
 
@@ -577,8 +577,8 @@ int ch, err, n, p;
                                 obuf = mem->OutBuf[p];
                                 bufpos = status->OutHead;
                                 while ( (port->gs.xmit_cnt > 0)         &&
-                                        (!port->gs.tty->stopped)        &&
-                                        (!port->gs.tty->hw_stopped) ){  /* While there are chars to transmit */
+                                        (!port->gs.port.tty->stopped)   &&
+                                        (!port->gs.port.tty->hw_stopped) ){     /* While there are chars to transmit */
                                         if (((bufpos+1) & A2232_IOBUFLENMASK) != status->OutTail) { /* If the A2232 buffer is not full */
                                                 ch = port->gs.xmit_buf[port->gs.xmit_tail];                                     /* get the next char to transmit */
                                                 port->gs.xmit_tail = (port->gs.xmit_tail+1) & (SERIAL_XMIT_SIZE-1); /* modulo-addition for the gs.xmit_buf ring-buffer */
@@ -592,8 +592,8 @@ int ch, err, n, p;
                                 status->OutHead = bufpos;
                                         
                                 /* WakeUp if output buffer runs low */
-                                if ((port->gs.xmit_cnt <= port->gs.wakeup_chars) && port->gs.tty) {
-                                        tty_wakeup(port->gs.tty);
+                                if ((port->gs.xmit_cnt <= port->gs.wakeup_chars) && port->gs.port.tty) {
+                                        tty_wakeup(port->gs.port.tty);
                                 }
                         } // if the port is used
                 } // for every port on the board
@@ -613,16 +613,16 @@ int ch, err, n, p;
                                                 struct a2232_port *port = &a2232_ports[n*7+p];
                                                 port->cd_status = !(ncd & 1); /* ncd&1 <=> CD is now off */
 
-                                                if (!(port->gs.flags & ASYNC_CHECK_CD))
+                                                if (!(port->gs.port.flags & ASYNC_CHECK_CD))
                                                         ;       /* Don't report DCD changes */
                                                 else if (port->cd_status) { // if DCD on: DCD went UP!
                                                         
                                                         /* Are we blocking in open?*/
-                                                        wake_up_interruptible(&port->gs.open_wait);
+                                                        wake_up_interruptible(&port->gs.port.open_wait);
                                                 }
                                                 else { // if DCD off: DCD went DOWN!
-                                                        if (port->gs.tty)
-                                                                tty_hangup (port->gs.tty);
+                                                        if (port->gs.port.tty)
+                                                                tty_hangup (port->gs.port.tty);
                                                 }
                                                 
                                         } // if CD changed for this port
@@ -655,8 +655,8 @@ static void a2232_init_portstructs(void)
 #ifdef NEW_WRITE_LOCKING
                 mutex_init(&(port->gs.port_write_mutex));
 #endif
-                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);
         }
 }