serial: kill off uart_info

We moved this into uart_state, now move the fields out of the separate
structure and kill it off.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index e09d3cebb4fb..055034d12b1c 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -328,9 +328,9 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
         unsigned char ch, r1, flag;
 
         tty = NULL;
-        if (up->port.info != NULL &&            /* Unopened serial console */
-            up->port.info->port.tty != NULL)    /* Keyboard || mouse */
-                tty = up->port.info->port.tty;
+        if (up->port.state != NULL &&           /* Unopened serial console */
+            up->port.state->port.tty != NULL)   /* Keyboard || mouse */
+                tty = up->port.state->port.tty;
 
         for (;;) {
 
@@ -451,7 +451,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,
                         uart_handle_cts_change(&up->port,
                                                (status & CTS));
 
-                wake_up_interruptible(&up->port.info->delta_msr_wait);
+                wake_up_interruptible(&up->port.state->delta_msr_wait);
         }
 
         up->prev_status = status;
@@ -501,9 +501,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
                 return;
         }
 
-        if (up->port.info == NULL)
+        if (up->port.state == NULL)
                 goto ack_tx_int;
-        xmit = &up->port.info->xmit;
+        xmit = &up->port.state->xmit;
         if (uart_circ_empty(xmit))
                 goto ack_tx_int;
 
@@ -705,7 +705,7 @@ static void sunzilog_start_tx(struct uart_port *port)
                 port->icount.tx++;
                 port->x_char = 0;
         } else {
-                struct circ_buf *xmit = &port->info->xmit;
+                struct circ_buf *xmit = &port->state->xmit;
 
                 writeb(xmit->buf[xmit->tail], &channel->data);
                 ZSDELAY();