Commit ebd2c8f6 authored by Alan Cox's avatar Alan Cox Committed by Live-CD User
Browse files

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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 11d85d7b

arch/mn10300/kernel/asm-offsets.c

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void foo(void) 
	OFFSET(__iobase,		mn10300_serial_port, _iobase);



	DEFINE(__UART_XMIT_SIZE,	UART_XMIT_SIZE);

	OFFSET(__xmit_buffer,		uart_info, xmit.buf);

	OFFSET(__xmit_head,		uart_info, xmit.head);

	OFFSET(__xmit_tail,		uart_info, xmit.tail);

	OFFSET(__xmit_buffer,		uart_state, xmit.buf);

	OFFSET(__xmit_head,		uart_state, xmit.head);

	OFFSET(__xmit_tail,		uart_state, xmit.tail);

}

drivers/serial/21285.c

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void serial21285_enable_ms(struct uart_port *port) 
static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)

{

	struct uart_port *port = dev_id;

	struct tty_struct *tty = port->info->port.tty;

	struct tty_struct *tty = port->state->port.tty;

	unsigned int status, ch, flag, rxs, max_count = 256;



	status = *CSR_UARTFLG;
@@ -124,7 +124,7 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id) 
static irqreturn_t serial21285_tx_chars(int irq, void *dev_id)

{

	struct uart_port *port = dev_id;

	struct circ_buf *xmit = &port->info->xmit;

	struct circ_buf *xmit = &port->state->xmit;

	int count = 256;



	if (port->x_char) {
@@ -235,8 +235,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios, 
	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 

	quot = uart_get_divisor(port, baud);



	if (port->info && port->info->port.tty) {

		struct tty_struct *tty = port->info->port.tty;

	if (port->state && port->state->port.tty) {

		struct tty_struct *tty = port->state->port.tty;

		unsigned int b = port->uartclk / (16 * quot);

		tty_encode_baud_rate(tty, b, b);

	}

drivers/serial/8250.c

+5 −5
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ static void serial8250_enable_ms(struct uart_port *port) 
static void

receive_chars(struct uart_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;
@@ -1457,7 +1457,7 @@ receive_chars(struct uart_8250_port *up, unsigned int *status) 


static void transmit_chars(struct uart_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) {
@@ -1500,7 +1500,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up) 
	status |= up->msr_saved_flags;

	up->msr_saved_flags = 0;

	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)
@@ -1510,7 +1510,7 @@ static unsigned int check_modem_status(struct uart_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;
@@ -1764,7 +1764,7 @@ static void serial8250_backup_timeout(unsigned long data) 
	up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;

	spin_unlock_irqrestore(&up->port.lock, flags);

	if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&

	    (!uart_circ_empty(&up->port.info->xmit) || up->port.x_char) &&

	    (!uart_circ_empty(&up->port.state->xmit) || up->port.x_char) &&

	    (lsr & UART_LSR_THRE)) {

		iir &= ~(UART_IIR_ID | UART_IIR_NO_INT);

		iir |= UART_IIR_THRI;

drivers/serial/amba-pl010.c

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void pl010_enable_ms(struct uart_port *port) 


static void pl010_rx_chars(struct uart_amba_port *uap)

{

	struct tty_struct *tty = uap->port.info->port.tty;

	struct tty_struct *tty = uap->port.state->port.tty;

	unsigned int status, ch, flag, rsr, max_count = 256;



	status = readb(uap->port.membase + UART01x_FR);
@@ -172,7 +172,7 @@ static void pl010_rx_chars(struct uart_amba_port *uap) 


static void pl010_tx_chars(struct uart_amba_port *uap)

{

	struct circ_buf *xmit = &uap->port.info->xmit;

	struct circ_buf *xmit = &uap->port.state->xmit;

	int count;



	if (uap->port.x_char) {
@@ -225,7 +225,7 @@ static void pl010_modem_status(struct uart_amba_port *uap) 
	if (delta & UART01x_FR_CTS)

		uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);



	wake_up_interruptible(&uap->port.info->delta_msr_wait);

	wake_up_interruptible(&uap->port.state->delta_msr_wait);

}



static irqreturn_t pl010_int(int irq, void *dev_id)

drivers/serial/amba-pl011.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void pl011_enable_ms(struct uart_port *port) 


static void pl011_rx_chars(struct uart_amba_port *uap)

{

	struct tty_struct *tty = uap->port.info->port.tty;

	struct tty_struct *tty = uap->port.state->port.tty;

	unsigned int status, ch, flag, max_count = 256;



	status = readw(uap->port.membase + UART01x_FR);
@@ -175,7 +175,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap) 


static void pl011_tx_chars(struct uart_amba_port *uap)

{

	struct circ_buf *xmit = &uap->port.info->xmit;

	struct circ_buf *xmit = &uap->port.state->xmit;

	int count;



	if (uap->port.x_char) {
@@ -226,7 +226,7 @@ static void pl011_modem_status(struct uart_amba_port *uap) 
	if (delta & UART01x_FR_CTS)

		uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);



	wake_up_interruptible(&uap->port.info->delta_msr_wait);

	wake_up_interruptible(&uap->port.state->delta_msr_wait);

}



static irqreturn_t pl011_int(int irq, void *dev_id)