Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.

1 files changed, 14 insertions, 27 deletions

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 77623b936538..a4c42a75a3bf 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -526,19 +526,6 @@ static int gsm_stuff_frame(const u8 *input, u8 *output, int len)
         return olen;
 }
 
-static void hex_packet(const unsigned char *p, int len)
-{
-        int i;
-        for (i = 0; i < len; i++) {
-                if (i && (i % 16) == 0) {
-                        pr_cont("\n");
-                        pr_debug("");
-                }
-                pr_cont("%02X ", *p++);
-        }
-        pr_cont("\n");
-}
-
 /**
  *      gsm_send        -       send a control frame
  *      @gsm: our GSM mux
@@ -685,10 +672,10 @@ static void gsm_data_kick(struct gsm_mux *gsm)
                         len = msg->len + 2;
                 }
 
-                if (debug & 4) {
-                        pr_debug("gsm_data_kick:\n");
-                        hex_packet(gsm->txframe, len);
-                }
+                if (debug & 4)
+                        print_hex_dump_bytes("gsm_data_kick: ",
+                                             DUMP_PREFIX_OFFSET,
+                                             gsm->txframe, len);
 
                 if (gsm->output(gsm, gsm->txframe + skip_sof,
                                                 len - skip_sof) < 0)
@@ -2095,10 +2082,9 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)
                 set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
                 return -ENOSPC;
         }
-        if (debug & 4) {
-                pr_debug("-->%d bytes out\n", len);
-                hex_packet(data, len);
-        }
+        if (debug & 4)
+                print_hex_dump_bytes("gsmld_output: ", DUMP_PREFIX_OFFSET,
+                                     data, len);
         gsm->tty->ops->write(gsm->tty, data, len);
         return len;
 }
@@ -2142,8 +2128,8 @@ static void gsmld_detach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)
         gsm->tty = NULL;
 }
 
-static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
-                              char *fp, int count)
+static unsigned int gsmld_receive_buf(struct tty_struct *tty,
+                const unsigned char *cp, char *fp, int count)
 {
         struct gsm_mux *gsm = tty->disc_data;
         const unsigned char *dp;
@@ -2152,10 +2138,9 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
         char buf[64];
         char flags;
 
-        if (debug & 4) {
-                pr_debug("Inbytes %dd\n", count);
-                hex_packet(cp, count);
-        }
+        if (debug & 4)
+                print_hex_dump_bytes("gsmld_receive: ", DUMP_PREFIX_OFFSET,
+                                     cp, count);
 
         for (i = count, dp = cp, f = fp; i; i--, dp++) {
                 flags = *f++;
@@ -2177,6 +2162,8 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
         }
         /* FASYNC if needed ? */
         /* If clogged call tty_throttle(tty); */
+
+        return count;
 }
 
 /**