diff options
author | Alan Cox <alan@linux.intel.com> | 2009-09-19 16:13:28 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:28 -0400 |
commit | ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 (patch) | |
tree | 36a01b2ac2520bf7e0d9362b8da17d3c894da2db /drivers/serial/serial_txx9.c | |
parent | 11d85d7b2ecc72fe752bba55389e7d11907528af (diff) |
serial: kill off uart_info
We moved this into uart_state, now move the fields out of the separate
structure and kill it off.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/serial_txx9.c')
-rw-r--r-- | drivers/serial/serial_txx9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 54dd16d66a4b..0f7cf4c453e6 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port) | |||
272 | static inline void | 272 | static inline void |
273 | receive_chars(struct uart_txx9_port *up, unsigned int *status) | 273 | receive_chars(struct uart_txx9_port *up, unsigned int *status) |
274 | { | 274 | { |
275 | struct tty_struct *tty = up->port.info->port.tty; | 275 | struct tty_struct *tty = up->port.state->port.tty; |
276 | unsigned char ch; | 276 | unsigned char ch; |
277 | unsigned int disr = *status; | 277 | unsigned int disr = *status; |
278 | int max_count = 256; | 278 | int max_count = 256; |
@@ -348,7 +348,7 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status) | |||
348 | 348 | ||
349 | static inline void transmit_chars(struct uart_txx9_port *up) | 349 | static inline void transmit_chars(struct uart_txx9_port *up) |
350 | { | 350 | { |
351 | struct circ_buf *xmit = &up->port.info->xmit; | 351 | struct circ_buf *xmit = &up->port.state->xmit; |
352 | int count; | 352 | int count; |
353 | 353 | ||
354 | if (up->port.x_char) { | 354 | if (up->port.x_char) { |