Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial patches from Greg Kroah-Hartman:
 "Here's the big tty/serial driver patches for 3.9-rc1.

  More tty port rework and fixes from Jiri here, as well as lots of
  individual serial driver updates and fixes.

  All of these have been in the linux-next tree for a while."

* tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits)
  tty: mxser: improve error handling in mxser_probe() and mxser_module_init()
  serial: imx: fix uninitialized variable warning
  serial: tegra: assume CONFIG_OF
  TTY: do not update atime/mtime on read/write
  lguest: select CONFIG_TTY to build properly.
  ARM defconfigs: add missing inclusions of linux/platform_device.h
  fb/exynos: include platform_device.h
  ARM: sa1100/assabet: include platform_device.h directly
  serial: imx: Fix recursive locking bug
  pps: Fix build breakage from decoupling pps from tty
  tty: Remove ancient hardpps()
  pps: Additional cleanups in uart_handle_dcd_change
  pps: Move timestamp read into PPS code proper
  pps: Don't crash the machine when exiting will do
  pps: Fix a use-after free bug when unregistering a source.
  pps: Use pps_lookup_dev to reduce ldisc coupling
  pps: Add pps_lookup_dev() function
  tty: serial: uartlite: Support uartlite on big and little endian systems
  tty: serial: uartlite: Fix sparse and checkpatch warnings
  serial/arc-uart: Miscll DT related updates (Grant's review comments)
  ...

Fix up trivial conflicts, mostly just due to the TTY config option
clashing with the EXPERIMENTAL removal.

1 files changed, 10 insertions, 10 deletions

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index 81d5cb9b6569..bf6e949a2f87 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -524,7 +524,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
 static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
 {
         struct uart_icount *icount = &port->uart.icount;
-        struct tty_struct *tty = port->uart.state->port.tty;
+        struct tty_port *tport = &port->uart.state->port;
         unsigned ix;
         int count;
         u8 st, ch, push, status, overrun;
@@ -534,10 +534,10 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
         push = 0;
 
         count = CIRC_CNT(port->rx_inp, port->rx_outp, MNSC_BUFFER_SIZE);
-        count = tty_buffer_request_room(tty, count);
+        count = tty_buffer_request_room(tport, count);
         if (count == 0) {
-                if (!tty->low_latency)
-                        tty_flip_buffer_push(tty);
+                if (!tport->low_latency)
+                        tty_flip_buffer_push(tport);
                 return;
         }
 
@@ -545,8 +545,8 @@ try_again:
         /* pull chars out of the hat */
         ix = ACCESS_ONCE(port->rx_outp);
         if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) {
-                if (push && !tty->low_latency)
-                        tty_flip_buffer_push(tty);
+                if (push && !tport->low_latency)
+                        tty_flip_buffer_push(tport);
                 return;
         }
 
@@ -666,19 +666,19 @@ insert:
                 else
                         flag = TTY_NORMAL;
 
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(tport, ch, flag);
         }
 
         /* overrun is special, since it's reported immediately, and doesn't
          * affect the current character
          */
         if (overrun)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
 
         count--;
         if (count <= 0) {
-                if (!tty->low_latency)
-                        tty_flip_buffer_push(tty);
+                if (!tport->low_latency)
+                        tty_flip_buffer_push(tport);
                 return;
         }