diff options
Diffstat (limited to 'drivers/serial/amba-pl011.c')
-rw-r--r-- | drivers/serial/amba-pl011.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 72ba0c6d3551..ef82a34baf0f 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
@@ -124,7 +124,7 @@ static void pl011_enable_ms(struct uart_port *port) | |||
124 | 124 | ||
125 | static void pl011_rx_chars(struct uart_amba_port *uap) | 125 | static void pl011_rx_chars(struct uart_amba_port *uap) |
126 | { | 126 | { |
127 | struct tty_struct *tty = uap->port.info->port.tty; | 127 | struct tty_struct *tty = uap->port.state->port.tty; |
128 | unsigned int status, ch, flag, max_count = 256; | 128 | unsigned int status, ch, flag, max_count = 256; |
129 | 129 | ||
130 | status = readw(uap->port.membase + UART01x_FR); | 130 | status = readw(uap->port.membase + UART01x_FR); |
@@ -175,7 +175,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap) | |||
175 | 175 | ||
176 | static void pl011_tx_chars(struct uart_amba_port *uap) | 176 | static void pl011_tx_chars(struct uart_amba_port *uap) |
177 | { | 177 | { |
178 | struct circ_buf *xmit = &uap->port.info->xmit; | 178 | struct circ_buf *xmit = &uap->port.state->xmit; |
179 | int count; | 179 | int count; |
180 | 180 | ||
181 | if (uap->port.x_char) { | 181 | if (uap->port.x_char) { |
@@ -226,7 +226,7 @@ static void pl011_modem_status(struct uart_amba_port *uap) | |||
226 | if (delta & UART01x_FR_CTS) | 226 | if (delta & UART01x_FR_CTS) |
227 | uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS); | 227 | uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS); |
228 | 228 | ||
229 | wake_up_interruptible(&uap->port.info->delta_msr_wait); | 229 | wake_up_interruptible(&uap->port.state->delta_msr_wait); |
230 | } | 230 | } |
231 | 231 | ||
232 | static irqreturn_t pl011_int(int irq, void *dev_id) | 232 | static irqreturn_t pl011_int(int irq, void *dev_id) |