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

Pull TTY/serial patches from Greg KH:
 "tty and serial merge for 3.4-rc1

  Here's the big serial and tty merge for the 3.4-rc1 tree.

  There's loads of fixes and reworks in here from Jiri for the tty
  layer, and a number of patches from Alan to help try to wrestle the vt
  layer into a sane model.

  Other than that, lots of driver updates and fixes, and other minor
  stuff, all detailed in the shortlog."

* tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (132 commits)
  serial: pxa: add clk_prepare/clk_unprepare calls
  TTY: Wrong unicode value copied in con_set_unimap()
  serial: PL011: clear pending interrupts
  serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it is reset.
  vt: NULL dereference in vt_do_kdsk_ioctl()
  tty: serial: vt8500: fix annotations for probe/remove
  serial: remove back and forth conversions in serial_out_sync
  serial: use serial_port_in/out vs serial_in/out in 8250
  serial: introduce generic port in/out helpers
  serial: reduce number of indirections in 8250 code
  serial: delete useless void casts in 8250.c
  serial: make 8250's serial_in shareable to other drivers.
  serial: delete last unused traces of pausing I/O in 8250
  pch_uart: Add module parameter descriptions
  pch_uart: Use existing default_baud in setup_console
  pch_uart: Add user_uartclk parameter
  pch_uart: Add Fish River Island II uart clock quirks
  pch_uart: Use uartclk instead of base_baud
  mpc5200b/uart: select more tolerant uart prescaler on low baudrates
  tty: moxa: fix bit test in moxa_start()
  ...

1 files changed, 23 insertions, 55 deletions

diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 783f4e50c111..3ea809430eda 100644
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -30,10 +30,9 @@ static int srm_is_registered_console = 0;
 #define MAX_SRM_CONSOLE_DEVICES 1       /* only support 1 console device */
 
 struct srmcons_private {
-        struct tty_struct *tty;
+        struct tty_port port;
         struct timer_list timer;
-        spinlock_t lock;
-};
+} srmcons_singleton;
 
 typedef union _srmcons_result {
         struct {
@@ -68,22 +67,21 @@ static void
 srmcons_receive_chars(unsigned long data)
 {
         struct srmcons_private *srmconsp = (struct srmcons_private *)data;
+        struct tty_port *port = &srmconsp->port;
         unsigned long flags;
         int incr = 10;
 
         local_irq_save(flags);
         if (spin_trylock(&srmcons_callback_lock)) {
-                if (!srmcons_do_receive_chars(srmconsp->tty))
+                if (!srmcons_do_receive_chars(port->tty))
                         incr = 100;
                 spin_unlock(&srmcons_callback_lock);
         } 
 
-        spin_lock(&srmconsp->lock);
-        if (srmconsp->tty) {
-                srmconsp->timer.expires = jiffies + incr;
-                add_timer(&srmconsp->timer);
-        }
-        spin_unlock(&srmconsp->lock);
+        spin_lock(&port->lock);
+        if (port->tty)
+                mod_timer(&srmconsp->timer, jiffies + incr);
+        spin_unlock(&port->lock);
 
         local_irq_restore(flags);
 }
@@ -156,56 +154,22 @@ srmcons_chars_in_buffer(struct tty_struct *tty)
 }
 
 static int
-srmcons_get_private_struct(struct srmcons_private **ps)
-{
-        static struct srmcons_private *srmconsp = NULL;
-        static DEFINE_SPINLOCK(srmconsp_lock);
-        unsigned long flags;
-        int retval = 0;
-
-        if (srmconsp == NULL) {
-                srmconsp = kmalloc(sizeof(*srmconsp), GFP_KERNEL);
-                spin_lock_irqsave(&srmconsp_lock, flags);
-
-                if (srmconsp == NULL)
-                        retval = -ENOMEM;
-                else {
-                        srmconsp->tty = NULL;
-                        spin_lock_init(&srmconsp->lock);
-                        init_timer(&srmconsp->timer);
-                }
-
-                spin_unlock_irqrestore(&srmconsp_lock, flags);
-        }
-
-        *ps = srmconsp;
-        return retval;
-}
-
-static int
 srmcons_open(struct tty_struct *tty, struct file *filp)
 {
-        struct srmcons_private *srmconsp;
+        struct srmcons_private *srmconsp = &srmcons_singleton;
+        struct tty_port *port = &srmconsp->port;
         unsigned long flags;
-        int retval;
-
-        retval = srmcons_get_private_struct(&srmconsp);
-        if (retval)
-                return retval;
 
-        spin_lock_irqsave(&srmconsp->lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
 
-        if (!srmconsp->tty) {
+        if (!port->tty) {
                 tty->driver_data = srmconsp;
-
-                srmconsp->tty = tty;
-                srmconsp->timer.function = srmcons_receive_chars;
-                srmconsp->timer.data = (unsigned long)srmconsp;
-                srmconsp->timer.expires = jiffies + 10;
-                add_timer(&srmconsp->timer);
+                tty->port = port;
+                port->tty = tty; /* XXX proper refcounting */
+                mod_timer(&srmconsp->timer, jiffies + 10);
         }
 
-        spin_unlock_irqrestore(&srmconsp->lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
 
         return 0;
 }
@@ -214,16 +178,17 @@ static void
 srmcons_close(struct tty_struct *tty, struct file *filp)
 {
         struct srmcons_private *srmconsp = tty->driver_data;
+        struct tty_port *port = &srmconsp->port;
         unsigned long flags;
 
-        spin_lock_irqsave(&srmconsp->lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
 
         if (tty->count == 1) {
-                srmconsp->tty = NULL;
+                port->tty = NULL;
                 del_timer(&srmconsp->timer);
         }
 
-        spin_unlock_irqrestore(&srmconsp->lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 
 
@@ -240,6 +205,9 @@ static const struct tty_operations srmcons_ops = {
 static int __init
 srmcons_init(void)
 {
+        tty_port_init(&srmcons_singleton.port);
+        setup_timer(&srmcons_singleton.timer, srmcons_receive_chars,
+                        (unsigned long)&srmcons_singleton);
         if (srm_is_registered_console) {
                 struct tty_driver *driver;
                 int err;