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()
  ...

5 files changed, 1 insertions, 286 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43643033a3ae..ee946865d6cb 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -66,21 +66,6 @@ config TTY_PRINTK
 
           If unsure, say N.
 
-config BRIQ_PANEL
-        tristate 'Total Impact briQ front panel driver'
-        depends on PPC_CHRP
-        ---help---
-          The briQ is a small footprint CHRP computer with a frontpanel VFD, a
-          tristate led and two switches. It is the size of a CDROM drive.
-
-          If you have such one and want anything showing on the VFD then you
-          must answer Y here.
-
-          To compile this driver as a module, choose M here: the
-          module will be called briq_panel.
-
-          It's safe to say N here.
-
 config BFIN_OTP
         tristate "Blackfin On-Chip OTP Memory Support"
         depends on BLACKFIN && (BF51x || BF52x || BF54x)
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 32762ba769c2..0dc5d7ce4864 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_UV_MMTIMER)	+= uv_mmtimer.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
 obj-$(CONFIG_IBM_BSR)           += bsr.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
-obj-$(CONFIG_BRIQ_PANEL)        += briq_panel.o
 obj-$(CONFIG_BFIN_OTP)          += bfin-otp.o
 
 obj-$(CONFIG_PRINTER)           += lp.o
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
deleted file mode 100644
index 095ab90535ce..000000000000
--- a/drivers/char/briq_panel.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Drivers for the Total Impact PPC based computer "BRIQ"
- * by Dr. Karsten Jeppesen
- *
- */
-
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/timer.h>
-#include <linux/kernel.h>
-#include <linux/wait.h>
-#include <linux/string.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/miscdevice.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-
-#define         BRIQ_PANEL_MINOR        156
-#define         BRIQ_PANEL_VFD_IOPORT   0x0390
-#define         BRIQ_PANEL_LED_IOPORT   0x0398
-#define         BRIQ_PANEL_VER          "1.1 (04/20/2002)"
-#define         BRIQ_PANEL_MSG0         "Loading Linux"
-
-static int              vfd_is_open;
-static unsigned char    vfd[40];
-static int              vfd_cursor;
-static unsigned char    ledpb, led;
-
-static void update_vfd(void)
-{
-        int     i;
-
-        /* cursor home */
-        outb(0x02, BRIQ_PANEL_VFD_IOPORT);
-        for (i=0; i<20; i++)
-                outb(vfd[i], BRIQ_PANEL_VFD_IOPORT + 1);
-
-        /* cursor to next line */
-        outb(0xc0, BRIQ_PANEL_VFD_IOPORT);
-        for (i=20; i<40; i++)
-                outb(vfd[i], BRIQ_PANEL_VFD_IOPORT + 1);
-
-}
-
-static void set_led(char state)
-{
-        if (state == 'R')
-                led = 0x01;
-        else if (state == 'G')
-                led = 0x02;
-        else if (state == 'Y')
-                led = 0x03;
-        else if (state == 'X')
-                led = 0x00;
-        outb(led, BRIQ_PANEL_LED_IOPORT);
-}
-
-static int briq_panel_open(struct inode *ino, struct file *filep)
-{
-        tty_lock();
-        /* enforce single access, vfd_is_open is protected by BKL */
-        if (vfd_is_open) {
-                tty_unlock();
-                return -EBUSY;
-        }
-        vfd_is_open = 1;
-
-        tty_unlock();
-        return 0;
-}
-
-static int briq_panel_release(struct inode *ino, struct file *filep)
-{
-        if (!vfd_is_open)
-                return -ENODEV;
-
-        vfd_is_open = 0;
-
-        return 0;
-}
-
-static ssize_t briq_panel_read(struct file *file, char __user *buf, size_t count,
-                         loff_t *ppos)
-{
-        unsigned short c;
-        unsigned char cp;
-
-        if (!vfd_is_open)
-                return -ENODEV;
-
-        c = (inb(BRIQ_PANEL_LED_IOPORT) & 0x000c) | (ledpb & 0x0003);
-        set_led(' ');
-        /* upper button released */
-        if ((!(ledpb & 0x0004)) && (c & 0x0004)) {
-                cp = ' ';
-                ledpb = c;
-                if (copy_to_user(buf, &cp, 1))
-                        return -EFAULT;
-                return 1;
-        }
-        /* lower button released */
-        else if ((!(ledpb & 0x0008)) && (c & 0x0008)) {
-                cp = '\r';
-                ledpb = c;
-                if (copy_to_user(buf, &cp, 1))
-                        return -EFAULT;
-                return 1;
-        } else {
-                ledpb = c;
-                return 0;
-        }
-}
-
-static void scroll_vfd( void )
-{
-        int     i;
-
-        for (i=0; i<20; i++) {
-                vfd[i] = vfd[i+20];
-                vfd[i+20] = ' ';
-        }
-        vfd_cursor = 20;
-}
-
-static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_t len,
-                          loff_t *ppos)
-{
-        size_t indx = len;
-        int i, esc = 0;
-
-        if (!vfd_is_open)
-                return -EBUSY;
-
-        for (;;) {
-                char c;
-                if (!indx)
-                        break;
-                if (get_user(c, buf))
-                        return -EFAULT;
-                if (esc) {
-                        set_led(c);
-                        esc = 0;
-                } else if (c == 27) {
-                        esc = 1;
-                } else if (c == 12) {
-                        /* do a form feed */
-                        for (i=0; i<40; i++)
-                                vfd[i] = ' ';
-                        vfd_cursor = 0;
-                } else if (c == 10) {
-                        if (vfd_cursor < 20)
-                                vfd_cursor = 20;
-                        else if (vfd_cursor < 40)
-                                vfd_cursor = 40;
-                        else if (vfd_cursor < 60)
-                                vfd_cursor = 60;
-                        if (vfd_cursor > 59)
-                                scroll_vfd();
-                } else {
-                        /* just a character */
-                        if (vfd_cursor > 39)
-                                scroll_vfd();
-                        vfd[vfd_cursor++] = c;
-                }
-                indx--;
-                buf++;
-        }
-        update_vfd();
-
-        return len;
-}
-
-static const struct file_operations briq_panel_fops = {
-        .owner          = THIS_MODULE,
-        .read           = briq_panel_read,
-        .write          = briq_panel_write,
-        .open           = briq_panel_open,
-        .release        = briq_panel_release,
-        .llseek         = noop_llseek,
-};
-
-static struct miscdevice briq_panel_miscdev = {
-        BRIQ_PANEL_MINOR,
-        "briq_panel",
-        &briq_panel_fops
-};
-
-static int __init briq_panel_init(void)
-{
-        struct device_node *root = of_find_node_by_path("/");
-        const char *machine;
-        int i;
-
-        machine = of_get_property(root, "model", NULL);
-        if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) {
-                of_node_put(root);
-                return -ENODEV;
-        }
-        of_node_put(root);
-
-        printk(KERN_INFO
-                "briq_panel: v%s Dr. Karsten Jeppesen (kj@totalimpact.com)\n",
-                BRIQ_PANEL_VER);
-
-        if (!request_region(BRIQ_PANEL_VFD_IOPORT, 4, "BRIQ Front Panel"))
-                return -EBUSY;
-
-        if (!request_region(BRIQ_PANEL_LED_IOPORT, 2, "BRIQ Front Panel")) {
-                release_region(BRIQ_PANEL_VFD_IOPORT, 4);
-                return -EBUSY;
-        }
-        ledpb = inb(BRIQ_PANEL_LED_IOPORT) & 0x000c;
-
-        if (misc_register(&briq_panel_miscdev) < 0) {
-                release_region(BRIQ_PANEL_VFD_IOPORT, 4);
-                release_region(BRIQ_PANEL_LED_IOPORT, 2);
-                return -EBUSY;
-        }
-
-        outb(0x38, BRIQ_PANEL_VFD_IOPORT);      /* Function set */
-        outb(0x01, BRIQ_PANEL_VFD_IOPORT);      /* Clear display */
-        outb(0x0c, BRIQ_PANEL_VFD_IOPORT);      /* Display on */
-        outb(0x06, BRIQ_PANEL_VFD_IOPORT);      /* Entry normal */
-        for (i=0; i<40; i++)
-                vfd[i]=' ';
-#ifndef MODULE
-        vfd[0] = 'L';
-        vfd[1] = 'o';
-        vfd[2] = 'a';
-        vfd[3] = 'd';
-        vfd[4] = 'i';
-        vfd[5] = 'n';
-        vfd[6] = 'g';
-        vfd[7] = ' ';
-        vfd[8] = '.';
-        vfd[9] = '.';
-        vfd[10] = '.';
-#endif /* !MODULE */
-
-        update_vfd();
-
-        return 0;
-}
-
-static void __exit briq_panel_exit(void)
-{
-        misc_deregister(&briq_panel_miscdev);
-        release_region(BRIQ_PANEL_VFD_IOPORT, 4);
-        release_region(BRIQ_PANEL_LED_IOPORT, 2);
-}
-
-module_init(briq_panel_init);
-module_exit(briq_panel_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Karsten Jeppesen <karsten@jeppesens.com>");
-MODULE_DESCRIPTION("Driver for the Total Impact briQ front panel");
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 07f6a5abe372..f6453df4921c 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2484,7 +2484,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
 
         /* verify range of specified line number */
         line = tty->index;
-        if ((line < 0) || (line >= mgslpc_device_count)) {
+        if (line >= mgslpc_device_count) {
                 printk("%s(%d):mgslpc_open with invalid line #%d.\n",
                         __FILE__,__LINE__,line);
                 return -ENODEV;
@@ -2836,7 +2836,6 @@ static int __init synclink_cs_init(void)
 
     /* Initialize the tty_driver structure */
 
-    serial_driver->owner = THIS_MODULE;
     serial_driver->driver_name = "synclink_cs";
     serial_driver->name = "ttySLP";
     serial_driver->major = ttymajor;
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index eedd5474850c..46b77ede84c0 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -184,12 +184,10 @@ static int __init ttyprintk_init(void)
         if (!ttyprintk_driver)
                 return ret;
 
-        ttyprintk_driver->owner = THIS_MODULE;
         ttyprintk_driver->driver_name = "ttyprintk";
         ttyprintk_driver->name = "ttyprintk";
         ttyprintk_driver->major = TTYAUX_MAJOR;
         ttyprintk_driver->minor_start = 3;
-        ttyprintk_driver->num = 1;
         ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE;
         ttyprintk_driver->init_termios = tty_std_termios;
         ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET;