Commit b1d1619b authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds

atmel_serial: Fix tty_port breakage

The tty pointer has been moved into a tty_port field, so we need to use
->info->port.tty instead of just ->info->tty. Fixes these build errors:

David Brownell <david-b@pacbell.net> wrote:
> drivers/serial/atmel_serial.c: In function 'atmel_rx_from_ring':
> drivers/serial/atmel_serial.c:665: error: 'struct uart_info' has no member named 'tty'
> drivers/serial/atmel_serial.c: In function 'atmel_rx_from_dma':
> drivers/serial/atmel_serial.c:672: error: 'struct uart_info' has no member named 'tty'
> drivers/serial/atmel_serial.c: In function 'atmel_startup':
> drivers/serial/atmel_serial.c:797: error: 'struct uart_info' has no member named 'tty'
> make[2]: *** [drivers/serial/atmel_serial.o] Error 1
Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e60a1084
...@@ -662,14 +662,14 @@ static void atmel_rx_from_ring(struct uart_port *port) ...@@ -662,14 +662,14 @@ static void atmel_rx_from_ring(struct uart_port *port)
* uart_start(), which takes the lock. * uart_start(), which takes the lock.
*/ */
spin_unlock(&port->lock); spin_unlock(&port->lock);
tty_flip_buffer_push(port->info->tty); tty_flip_buffer_push(port->info->port.tty);
spin_lock(&port->lock); spin_lock(&port->lock);
} }
static void atmel_rx_from_dma(struct uart_port *port) static void atmel_rx_from_dma(struct uart_port *port)
{ {
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
struct tty_struct *tty = port->info->tty; struct tty_struct *tty = port->info->port.tty;
struct atmel_dma_buffer *pdc; struct atmel_dma_buffer *pdc;
int rx_idx = atmel_port->pdc_rx_idx; int rx_idx = atmel_port->pdc_rx_idx;
unsigned int head; unsigned int head;
...@@ -794,7 +794,7 @@ static void atmel_tasklet_func(unsigned long data) ...@@ -794,7 +794,7 @@ static void atmel_tasklet_func(unsigned long data)
static int atmel_startup(struct uart_port *port) static int atmel_startup(struct uart_port *port)
{ {
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
struct tty_struct *tty = port->info->tty; struct tty_struct *tty = port->info->port.tty;
int retval; int retval;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment