diff options
| author | Frank Li <Frank.Li@freescale.com> | 2010-09-06 13:19:49 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2011-01-17 14:56:19 +0100 |
| commit | 0a5793e9c6336f3d0f8b34166022695a4d677035 (patch) | |
| tree | b90bc57daeece4f789927bd22c0d4f76d2488495 /drivers/serial | |
| parent | cab8ba5ea1cf4a9040f92ad5cbc9148f935f29e3 (diff) | |
ENGR00127171-5 Kernel Upgrade: Fix all drivers build error for mx23/mx28
Fix build error because kernel upgrade
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/mxs-auart.c | 6 | ||||
| -rw-r--r-- | drivers/serial/mxs-duart.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/mxs-auart.c b/drivers/serial/mxs-auart.c index 63d7d9128efc..be79f0e8bf11 100644 --- a/drivers/serial/mxs-auart.c +++ b/drivers/serial/mxs-auart.c @@ -82,7 +82,7 @@ static inline struct mxs_auart_port *to_auart_port(struct uart_port *u) static inline void mxs_auart_tx_chars(struct mxs_auart_port *s) { - struct circ_buf *xmit = &s->port.info->xmit; + struct circ_buf *xmit = &s->port.state->xmit; if (s->flags & MXS_AUART_PORT_DMA_MODE) { int i = 0, size; @@ -134,7 +134,7 @@ static inline void mxs_auart_tx_chars(struct mxs_auart_port *s) } else break; } - if (uart_circ_empty(&(s->port.info->xmit))) + if (uart_circ_empty(&(s->port.state->xmit))) __raw_writel(BM_UARTAPP_INTR_TXIEN, s->port.membase + HW_UARTAPP_INTR_CLR); else @@ -180,7 +180,7 @@ mxs_auart_rx_char(struct mxs_auart_port *s, unsigned int stat, u8 c) static void mxs_auart_rx_chars(struct mxs_auart_port *s) { u8 c; - struct tty_struct *tty = s->port.info->port.tty; + struct tty_struct *tty = s->port.state->port.tty; u32 stat = 0; if (s->flags & MXS_AUART_PORT_DMA_MODE) { diff --git a/drivers/serial/mxs-duart.c b/drivers/serial/mxs-duart.c index 171b8628faee..64e5057344e1 100644 --- a/drivers/serial/mxs-duart.c +++ b/drivers/serial/mxs-duart.c @@ -100,7 +100,7 @@ static void duart_enable_ms(struct uart_port *port) static void duart_rx_chars(struct duart_port *dp) { - struct tty_struct *tty = dp->port.info->port.tty; + struct tty_struct *tty = dp->port.state->port.tty; unsigned int status, ch, flag, rsr, max_count = SERIAL_RX_LIMIT; status = __raw_readl(dp->port.membase + HW_UARTDBGFR); @@ -157,7 +157,7 @@ ignore_char: static void duart_tx_chars(struct duart_port *dp) { int count; - struct circ_buf *xmit = &dp->port.info->xmit; + struct circ_buf *xmit = &dp->port.state->xmit; if (dp->port.x_char) { __raw_writel(dp->port.x_char, dp->port.membase + HW_UARTDBGDR); @@ -208,7 +208,7 @@ static void duart_modem_status(struct duart_port *dp) if (delta & BM_UARTDBGFR_CTS) uart_handle_cts_change(&dp->port, status & BM_UARTDBGFR_CTS); - wake_up_interruptible(&dp->port.info->delta_msr_wait); + wake_up_interruptible(&dp->port.state->port.delta_msr_wait); } static irqreturn_t duart_int(int irq, void *dev_id) |