diff options
Diffstat (limited to 'drivers/serial/amba-pl010.c')
-rw-r--r-- | drivers/serial/amba-pl010.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 58a4879c7e48..429a8ae86933 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
@@ -117,7 +117,7 @@ static void pl010_enable_ms(struct uart_port *port) | |||
117 | 117 | ||
118 | static void pl010_rx_chars(struct uart_amba_port *uap) | 118 | static void pl010_rx_chars(struct uart_amba_port *uap) |
119 | { | 119 | { |
120 | struct tty_struct *tty = uap->port.info->port.tty; | 120 | struct tty_struct *tty = uap->port.state->port.tty; |
121 | unsigned int status, ch, flag, rsr, max_count = 256; | 121 | unsigned int status, ch, flag, rsr, max_count = 256; |
122 | 122 | ||
123 | status = readb(uap->port.membase + UART01x_FR); | 123 | status = readb(uap->port.membase + UART01x_FR); |
@@ -172,7 +172,7 @@ static void pl010_rx_chars(struct uart_amba_port *uap) | |||
172 | 172 | ||
173 | static void pl010_tx_chars(struct uart_amba_port *uap) | 173 | static void pl010_tx_chars(struct uart_amba_port *uap) |
174 | { | 174 | { |
175 | struct circ_buf *xmit = &uap->port.info->xmit; | 175 | struct circ_buf *xmit = &uap->port.state->xmit; |
176 | int count; | 176 | int count; |
177 | 177 | ||
178 | if (uap->port.x_char) { | 178 | if (uap->port.x_char) { |
@@ -225,7 +225,7 @@ static void pl010_modem_status(struct uart_amba_port *uap) | |||
225 | if (delta & UART01x_FR_CTS) | 225 | if (delta & UART01x_FR_CTS) |
226 | uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS); | 226 | uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS); |
227 | 227 | ||
228 | wake_up_interruptible(&uap->port.info->delta_msr_wait); | 228 | wake_up_interruptible(&uap->port.state->port.delta_msr_wait); |
229 | } | 229 | } |
230 | 230 | ||
231 | static irqreturn_t pl010_int(int irq, void *dev_id) | 231 | static irqreturn_t pl010_int(int irq, void *dev_id) |