1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/serial/max3100.c b/drivers/serial/max3100.c
index 9fd33e5622b..75ab00631c4 100644
--- a/drivers/serial/max3100.c
+++ b/drivers/serial/max3100.c
@@ -184,7 +184,7 @@ static void max3100_timeout(unsigned long data)
 {
         struct max3100_port *s = (struct max3100_port *)data;
 
-        if (s->port.info) {
+        if (s->port.state) {
                 max3100_dowork(s);
                 mod_timer(&s->timer, jiffies + s->poll_time);
         }
@@ -261,7 +261,7 @@ static void max3100_work(struct work_struct *w)
         int rxchars;
         u16 tx, rx;
         int conf, cconf, rts, crts;
-        struct circ_buf *xmit = &s->port.info->xmit;
+        struct circ_buf *xmit = &s->port.state->xmit;
 
         dev_dbg(&s->spi->dev, "%s\n", __func__);
 
@@ -307,8 +307,8 @@ static void max3100_work(struct work_struct *w)
                         }
                 }
 
-                if (rxchars > 16 && s->port.info->port.tty != NULL) {
-                        tty_flip_buffer_push(s->port.info->port.tty);
+                if (rxchars > 16 && s->port.state->port.tty != NULL) {
+                        tty_flip_buffer_push(s->port.state->port.tty);
                         rxchars = 0;
                 }
                 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
@@ -320,8 +320,8 @@ static void max3100_work(struct work_struct *w)
                   (!uart_circ_empty(xmit) &&
                    !uart_tx_stopped(&s->port))));
 
-        if (rxchars > 0 && s->port.info->port.tty != NULL)
-                tty_flip_buffer_push(s->port.info->port.tty);
+        if (rxchars > 0 && s->port.state->port.tty != NULL)
+                tty_flip_buffer_push(s->port.state->port.tty);
 }
 
 static irqreturn_t max3100_irq(int irqno, void *dev_id)
@@ -429,7 +429,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
         int baud = 0;
         unsigned cflag;
         u32 param_new, param_mask, parity = 0;
-        struct tty_struct *tty = s->port.info->port.tty;
+        struct tty_struct *tty = s->port.state->port.tty;
 
         dev_dbg(&s->spi->dev, "%s\n", __func__);
         if (!tty)
@@ -529,7 +529,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
                         MAX3100_STATUS_OE;
 
         /* we are sending char from a workqueue so enable */
-        s->port.info->port.tty->low_latency = 1;
+        s->port.state->port.tty->low_latency = 1;
 
         if (s->poll_time > 0)
                 del_timer_sync(&s->timer);