Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7043078630bbc9eb908a56e08077c5abe7f2d311

Authored by David Howells
Committed by Linus Torvalds
1 parent a70770998c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 9 additions and 9 deletions Side-by-side Diff

arch/mn10300/kernel/asm-offsets.c
Diff comments   View file @ 7043078
... ... @@ -85,7 +85,7 @@
85 85 OFFSET(__rx_buffer, mn10300_serial_port, rx_buffer);
86 86 OFFSET(__rx_inp, mn10300_serial_port, rx_inp);
87 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 89 OFFSET(__tx_xchar, mn10300_serial_port, tx_xchar);
90 90 OFFSET(__tx_break, mn10300_serial_port, tx_break);
91 91 OFFSET(__intr_flags, mn10300_serial_port, intr_flags);
arch/mn10300/kernel/mn10300-serial-low.S
Diff comments   View file @ 7043078
... ... @@ -130,7 +130,7 @@
130 130 or d2,d2
131 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 134 mov (__xmit_tail,a2),d3
135 135 mov (__xmit_head,a2),d2
136 136 cmp d3,d2
arch/mn10300/kernel/mn10300-serial.c
Diff comments   View file @ 7043078
... ... @@ -391,7 +391,7 @@
391 391 static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
392 392 {
393 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 395 unsigned ix;
396 396 int count;
397 397 u8 st, ch, push, status, overrun;
398 398  
399 399  
... ... @@ -566,16 +566,16 @@
566 566 {
567 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 570 mn10300_serial_dis_tx_intr(port);
571 571 return;
572 572 }
573 573  
574 574 if (uart_tx_stopped(&port->uart) ||
575   - uart_circ_empty(&port->uart.info->xmit))
  575 + uart_circ_empty(&port->uart.state->xmit))
576 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 579 uart_write_wakeup(&port->uart);
580 580 }
581 581  
... ... @@ -596,7 +596,7 @@
596 596 *port->_control = ctr;
597 597  
598 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 @@
705 705  
706 706 _enter("%s{%lu}",
707 707 port->name,
708   - CIRC_CNT(&port->uart.info->xmit.head,
709   - &port->uart.info->xmit.tail,
  708 + CIRC_CNT(&port->uart.state->xmit.head,
  709 + &port->uart.state->xmit.tail,
710 710 UART_XMIT_SIZE));
711 711  
712 712 /* kick the virtual DMA controller */