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, 2 insertions, 10 deletions

diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 0b56e3f43573..383133b201a1 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -481,13 +481,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         int idx = tty->index;
         struct pti_tty *pti_tty_data;
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
 
         if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
-                driver->ttys[idx] = tty;
-
                 pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL);
                 if (pti_tty_data == NULL)
                         return -ENOMEM;
@@ -911,21 +907,17 @@ static int __init pti_init(void)
 
         /* First register module as tty device */
 
-        pti_tty_driver = alloc_tty_driver(1);
+        pti_tty_driver = alloc_tty_driver(PTITTY_MINOR_NUM);
         if (pti_tty_driver == NULL) {
                 pr_err("%s(%d): Memory allocation failed for ptiTTY driver\n",
                         __func__, __LINE__);
                 return -ENOMEM;
         }
 
-        pti_tty_driver->owner                   = THIS_MODULE;
-        pti_tty_driver->magic                   = TTY_DRIVER_MAGIC;
         pti_tty_driver->driver_name             = DRIVERNAME;
         pti_tty_driver->name                    = TTYNAME;
         pti_tty_driver->major                   = 0;
         pti_tty_driver->minor_start             = PTITTY_MINOR_START;
-        pti_tty_driver->minor_num               = PTITTY_MINOR_NUM;
-        pti_tty_driver->num                     = PTITTY_MINOR_NUM;
         pti_tty_driver->type                    = TTY_DRIVER_TYPE_SYSTEM;
         pti_tty_driver->subtype                 = SYSTEM_TYPE_SYSCONS;
         pti_tty_driver->flags                   = TTY_DRIVER_REAL_RAW |