diff options
Diffstat (limited to 'drivers/serial/max3100.c')
-rw-r--r-- | drivers/serial/max3100.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/max3100.c b/drivers/serial/max3100.c index 9fd33e5622bd..75ab00631c41 100644 --- a/drivers/serial/max3100.c +++ b/drivers/serial/max3100.c | |||
@@ -184,7 +184,7 @@ static void max3100_timeout(unsigned long data) | |||
184 | { | 184 | { |
185 | struct max3100_port *s = (struct max3100_port *)data; | 185 | struct max3100_port *s = (struct max3100_port *)data; |
186 | 186 | ||
187 | if (s->port.info) { | 187 | if (s->port.state) { |
188 | max3100_dowork(s); | 188 | max3100_dowork(s); |
189 | mod_timer(&s->timer, jiffies + s->poll_time); | 189 | mod_timer(&s->timer, jiffies + s->poll_time); |
190 | } | 190 | } |
@@ -261,7 +261,7 @@ static void max3100_work(struct work_struct *w) | |||
261 | int rxchars; | 261 | int rxchars; |
262 | u16 tx, rx; | 262 | u16 tx, rx; |
263 | int conf, cconf, rts, crts; | 263 | int conf, cconf, rts, crts; |
264 | struct circ_buf *xmit = &s->port.info->xmit; | 264 | struct circ_buf *xmit = &s->port.state->xmit; |
265 | 265 | ||
266 | dev_dbg(&s->spi->dev, "%s\n", __func__); | 266 | dev_dbg(&s->spi->dev, "%s\n", __func__); |
267 | 267 | ||
@@ -307,8 +307,8 @@ static void max3100_work(struct work_struct *w) | |||
307 | } | 307 | } |
308 | } | 308 | } |
309 | 309 | ||
310 | if (rxchars > 16 && s->port.info->port.tty != NULL) { | 310 | if (rxchars > 16 && s->port.state->port.tty != NULL) { |
311 | tty_flip_buffer_push(s->port.info->port.tty); | 311 | tty_flip_buffer_push(s->port.state->port.tty); |
312 | rxchars = 0; | 312 | rxchars = 0; |
313 | } | 313 | } |
314 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 314 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
@@ -320,8 +320,8 @@ static void max3100_work(struct work_struct *w) | |||
320 | (!uart_circ_empty(xmit) && | 320 | (!uart_circ_empty(xmit) && |
321 | !uart_tx_stopped(&s->port)))); | 321 | !uart_tx_stopped(&s->port)))); |
322 | 322 | ||
323 | if (rxchars > 0 && s->port.info->port.tty != NULL) | 323 | if (rxchars > 0 && s->port.state->port.tty != NULL) |
324 | tty_flip_buffer_push(s->port.info->port.tty); | 324 | tty_flip_buffer_push(s->port.state->port.tty); |
325 | } | 325 | } |
326 | 326 | ||
327 | static irqreturn_t max3100_irq(int irqno, void *dev_id) | 327 | static irqreturn_t max3100_irq(int irqno, void *dev_id) |
@@ -429,7 +429,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios, | |||
429 | int baud = 0; | 429 | int baud = 0; |
430 | unsigned cflag; | 430 | unsigned cflag; |
431 | u32 param_new, param_mask, parity = 0; | 431 | u32 param_new, param_mask, parity = 0; |
432 | struct tty_struct *tty = s->port.info->port.tty; | 432 | struct tty_struct *tty = s->port.state->port.tty; |
433 | 433 | ||
434 | dev_dbg(&s->spi->dev, "%s\n", __func__); | 434 | dev_dbg(&s->spi->dev, "%s\n", __func__); |
435 | if (!tty) | 435 | if (!tty) |
@@ -529,7 +529,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios, | |||
529 | MAX3100_STATUS_OE; | 529 | MAX3100_STATUS_OE; |
530 | 530 | ||
531 | /* we are sending char from a workqueue so enable */ | 531 | /* we are sending char from a workqueue so enable */ |
532 | s->port.info->port.tty->low_latency = 1; | 532 | s->port.state->port.tty->low_latency = 1; |
533 | 533 | ||
534 | if (s->poll_time > 0) | 534 | if (s->poll_time > 0) |
535 | del_timer_sync(&s->timer); | 535 | del_timer_sync(&s->timer); |