aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-09-23 05:40:24 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 13:15:21 -0400
commit7043078630bbc9eb908a56e08077c5abe7f2d311 (patch)
tree59fdbb36fa304d30f82219f6519bd5d9d866ad28
parenta70770998c1d99e86eea97294ae3cce059a18d7e (diff)
MN10300: Handle removal of struct uart_info
Commit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 removed struct uart_info and commit bdc04e3174e18f475289fa8f4144f66686326b7e further moved delta_msr_wait. Fix up the MN10300 on-chip serial port drivers to comply with this. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/mn10300/kernel/asm-offsets.c2
-rw-r--r--arch/mn10300/kernel/mn10300-serial-low.S2
-rw-r--r--arch/mn10300/kernel/mn10300-serial.c14
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/mn10300/kernel/asm-offsets.c b/arch/mn10300/kernel/asm-offsets.c
index 82b40079ad76..02dc7e461fef 100644
--- a/arch/mn10300/kernel/asm-offsets.c
+++ b/arch/mn10300/kernel/asm-offsets.c
@@ -85,7 +85,7 @@ void foo(void)
85 OFFSET(__rx_buffer, mn10300_serial_port, rx_buffer); 85 OFFSET(__rx_buffer, mn10300_serial_port, rx_buffer);
86 OFFSET(__rx_inp, mn10300_serial_port, rx_inp); 86 OFFSET(__rx_inp, mn10300_serial_port, rx_inp);
87 OFFSET(__rx_outp, mn10300_serial_port, rx_outp); 87 OFFSET(__rx_outp, mn10300_serial_port, rx_outp);
88 OFFSET(__tx_info_buffer, mn10300_serial_port, uart.info); 88 OFFSET(__uart_state, mn10300_serial_port, uart.state);
89 OFFSET(__tx_xchar, mn10300_serial_port, tx_xchar); 89 OFFSET(__tx_xchar, mn10300_serial_port, tx_xchar);
90 OFFSET(__tx_break, mn10300_serial_port, tx_break); 90 OFFSET(__tx_break, mn10300_serial_port, tx_break);
91 OFFSET(__intr_flags, mn10300_serial_port, intr_flags); 91 OFFSET(__intr_flags, mn10300_serial_port, intr_flags);
diff --git a/arch/mn10300/kernel/mn10300-serial-low.S b/arch/mn10300/kernel/mn10300-serial-low.S
index 224485388228..66702d256610 100644
--- a/arch/mn10300/kernel/mn10300-serial-low.S
+++ b/arch/mn10300/kernel/mn10300-serial-low.S
@@ -130,7 +130,7 @@ ENTRY(mn10300_serial_vdma_tx_handler)
130 or d2,d2 130 or d2,d2
131 bne mnsc_vdma_tx_xchar 131 bne mnsc_vdma_tx_xchar
132 132
133 mov (__tx_info_buffer,a3),a2 # get the uart_info struct for Tx 133 mov (__uart_state,a3),a2 # see if the TTY Tx queue has anything in it
134 mov (__xmit_tail,a2),d3 134 mov (__xmit_tail,a2),d3
135 mov (__xmit_head,a2),d2 135 mov (__xmit_head,a2),d2
136 cmp d3,d2 136 cmp d3,d2
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index 2fd59664d00a..229b710fc5d5 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -391,7 +391,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
391static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) 391static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
392{ 392{
393 struct uart_icount *icount = &port->uart.icount; 393 struct uart_icount *icount = &port->uart.icount;
394 struct tty_struct *tty = port->uart.info->port.tty; 394 struct tty_struct *tty = port->uart.state->port.tty;
395 unsigned ix; 395 unsigned ix;
396 int count; 396 int count;
397 u8 st, ch, push, status, overrun; 397 u8 st, ch, push, status, overrun;
@@ -566,16 +566,16 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port)
566{ 566{
567 _enter("%s", port->name); 567 _enter("%s", port->name);
568 568
569 if (!port->uart.info || !port->uart.info->port.tty) { 569 if (!port->uart.state || !port->uart.state->port.tty) {
570 mn10300_serial_dis_tx_intr(port); 570 mn10300_serial_dis_tx_intr(port);
571 return; 571 return;
572 } 572 }
573 573
574 if (uart_tx_stopped(&port->uart) || 574 if (uart_tx_stopped(&port->uart) ||
575 uart_circ_empty(&port->uart.info->xmit)) 575 uart_circ_empty(&port->uart.state->xmit))
576 mn10300_serial_dis_tx_intr(port); 576 mn10300_serial_dis_tx_intr(port);
577 577
578 if (uart_circ_chars_pending(&port->uart.info->xmit) < WAKEUP_CHARS) 578 if (uart_circ_chars_pending(&port->uart.state->xmit) < WAKEUP_CHARS)
579 uart_write_wakeup(&port->uart); 579 uart_write_wakeup(&port->uart);
580} 580}
581 581
@@ -596,7 +596,7 @@ static void mn10300_serial_cts_changed(struct mn10300_serial_port *port, u8 st)
596 *port->_control = ctr; 596 *port->_control = ctr;
597 597
598 uart_handle_cts_change(&port->uart, st & SC2STR_CTS); 598 uart_handle_cts_change(&port->uart, st & SC2STR_CTS);
599 wake_up_interruptible(&port->uart.info->delta_msr_wait); 599 wake_up_interruptible(&port->uart.state->port.delta_msr_wait);
600} 600}
601 601
602/* 602/*
@@ -705,8 +705,8 @@ static void mn10300_serial_start_tx(struct uart_port *_port)
705 705
706 _enter("%s{%lu}", 706 _enter("%s{%lu}",
707 port->name, 707 port->name,
708 CIRC_CNT(&port->uart.info->xmit.head, 708 CIRC_CNT(&port->uart.state->xmit.head,
709 &port->uart.info->xmit.tail, 709 &port->uart.state->xmit.tail,
710 UART_XMIT_SIZE)); 710 UART_XMIT_SIZE));
711 711
712 /* kick the virtual DMA controller */ 712 /* kick the virtual DMA controller */