[PATCH 8/9] v8250: uart_info is gone

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



See upstream kernel.org commit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705
where things are relocated into uart_state

Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
---
 v8250.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/v8250.c b/v8250.c
index b422ad1..18849a6 100644
--- a/v8250.c
+++ b/v8250.c
@@ -178,7 +178,7 @@ static void serial8250_enable_ms(struct uart_port *port)
 static void
 receive_chars(struct vuart_8250_port *up, unsigned int *status)
 {
-	struct tty_struct *tty = up->port.info->port.tty;
+	struct tty_struct *tty = up->port.state->port.tty;
 	unsigned char ch, lsr = *status;
 	int max_count = 256;
 	char flag;
@@ -240,7 +240,7 @@ receive_chars(struct vuart_8250_port *up, unsigned int *status)
 
 static void transmit_chars(struct vuart_8250_port *up)
 {
-	struct circ_buf *xmit = &up->port.info->xmit;
+	struct circ_buf *xmit = &up->port.state->xmit;
 	int count;
 
 	if (up->port.x_char) {
@@ -281,7 +281,7 @@ static unsigned int check_modem_status(struct vuart_8250_port *up)
 	unsigned int status = serial_in(up, UART_MSR);
 
 	if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI && 
-	    up->port.info != NULL) {
+	    up->port.state != NULL) {
 		if (status & UART_MSR_TERI)
 			up->port.icount.rng++;
 		if (status & UART_MSR_DDSR)
@@ -291,7 +291,7 @@ static unsigned int check_modem_status(struct vuart_8250_port *up)
 		if (status & UART_MSR_DCTS)
 			uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
 
-		wake_up_interruptible(&up->port.info->delta_msr_wait);
+		wake_up_interruptible(&up->port.state->delta_msr_wait);
 	}
 
 	return status;
-- 
1.6.5.2


[Index of Archives]     [Linux Media Development]     [Asterisk]     [DCCP]     [Netdev]     [X.org]     [Xfree86]     [Fedora Women]     [Linux USB]

  Powered by Linux