14 files changed, 25 insertions, 309 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43643033a3a..ee946865d6c 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 32762ba769c..0dc5d7ce486 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 095ab90535c..00000000000
--- 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/hw_random/tx4939-rng.c b/drivers/char/hw_random/tx4939-rng.c
index 0bc0cb70210..de473ef3882 100644
--- a/drivers/char/hw_random/tx4939-rng.c
+++ b/drivers/char/hw_random/tx4939-rng.c
@@ -115,10 +115,7 @@ static int __init tx4939_rng_probe(struct platform_device *dev)
         rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL);
         if (!rngdev)
                 return -ENOMEM;
-        if (!devm_request_mem_region(&dev->dev, r->start, resource_size(r),
-                                     dev_name(&dev->dev)))
-                return -EBUSY;
-        rngdev->base = devm_ioremap(&dev->dev, r->start, resource_size(r));
+        rngdev->base = devm_request_and_ioremap(&dev->dev, r);
         if (!rngdev->base)
                 return -EBUSY;
 
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index da3cfee782d..eaade8a1ecd 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -94,7 +94,7 @@
 /* Note that *all* calls to CMOS_READ and CMOS_WRITE must be done with
  * rtc_lock held. Due to the index-port/data-port design of the RTC, we
  * don't want two different things trying to get to it at once. (e.g. the
- * periodic 11 min sync from time.c vs. this driver.)
+ * periodic 11 min sync from kernel/time/ntp.c vs. this driver.)
  */
 
 #include <linux/types.h>
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 07f6a5abe37..f6453df4921 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/ramoops.c b/drivers/char/ramoops.c
index 9fec3232b73..2a5e45d2a9f 100644
--- a/drivers/char/ramoops.c
+++ b/drivers/char/ramoops.c
@@ -26,7 +26,6 @@
 #include <linux/module.h>
 #include <linux/kmsg_dump.h>
 #include <linux/time.h>
-#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index ccd124ab7ca..872e09a02d2 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -57,8 +57,8 @@
  *      Note that *all* calls to CMOS_READ and CMOS_WRITE are done with
  *      interrupts disabled. Due to the index-port/data-port (0x70/0x71)
  *      design of the RTC, we don't want two different things trying to
- *      get to it at once. (e.g. the periodic 11 min sync from time.c vs.
- *      this driver.)
+ *      get to it at once. (e.g. the periodic 11 min sync from
+ *      kernel/time/ntp.c vs. this driver.)
  */
 
 #include <linux/interrupt.h>
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 0c964cdcc22..ce29e7cce52 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -797,7 +797,7 @@ static int __init tlclk_init(void)
         telclk_interrupt = (inb(TLCLK_REG7) & 0x0f);
 
         if (0x0F == telclk_interrupt ) { /* not MCPBL0010 ? */
-                printk(KERN_ERR "telclk_interrup = 0x%x non-mcpbl0010 hw.\n",
+                printk(KERN_ERR "telclk_interrupt = 0x%x non-mcpbl0010 hw.\n",
                         telclk_interrupt);
                 ret = -ENXIO;
                 goto out3;
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 7fc75e47e6d..a048199ce86 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -5,7 +5,6 @@
 menuconfig TCG_TPM
         tristate "TPM Hardware Support"
         depends on HAS_IOMEM
-        depends on EXPERIMENTAL
         select SECURITYFS
         ---help---
           If you have a TPM security chip in your system, which
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 32362cf35b8..ad7c7320dd1 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1221,12 +1221,13 @@ ssize_t tpm_read(struct file *file, char __user *buf,
         ret_size = atomic_read(&chip->data_pending);
         atomic_set(&chip->data_pending, 0);
         if (ret_size > 0) {     /* relay data */
+                ssize_t orig_ret_size = ret_size;
                 if (size < ret_size)
                         ret_size = size;
 
                 mutex_lock(&chip->buffer_mutex);
                 rc = copy_to_user(buf, chip->data_buffer, ret_size);
-                memset(chip->data_buffer, 0, ret_size);
+                memset(chip->data_buffer, 0, orig_ret_size);
                 if (rc)
                         ret_size = -EFAULT;
 
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 01054713828..b1c5280ac15 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -99,6 +99,8 @@ struct tpm_vendor_specific {
         wait_queue_head_t int_queue;
 };
 
+#define TPM_VID_INTEL    0x8086
+
 struct tpm_chip {
         struct device *dev;     /* Device stuff */
 
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index a1748621111..d2a70cae76d 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -76,7 +76,7 @@ enum tis_defaults {
 #define TPM_RID(l)                      (0x0F04 | ((l) << 12))
 
 static LIST_HEAD(tis_chips);
-static DEFINE_SPINLOCK(tis_lock);
+static DEFINE_MUTEX(tis_lock);
 
 #if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
 static int is_itpm(struct pnp_dev *dev)
@@ -367,7 +367,12 @@ static int probe_itpm(struct tpm_chip *chip)
                 0x00, 0x00, 0x00, 0xf1
         };
         size_t len = sizeof(cmd_getticks);
-        int rem_itpm = itpm;
+        bool rem_itpm = itpm;
+        u16 vendor = ioread16(chip->vendor.iobase + TPM_DID_VID(0));
+
+        /* probe only iTPMS */
+        if (vendor != TPM_VID_INTEL)
+                return 0;
 
         itpm = 0;
 
@@ -390,9 +395,6 @@ static int probe_itpm(struct tpm_chip *chip)
 out:
         itpm = rem_itpm;
         tpm_tis_ready(chip);
-        /* some TPMs need a break here otherwise they will not work
-         * correctly on the immediately subsequent command */
-        msleep(chip->vendor.timeout_b);
         release_locality(chip, chip->vendor.locality, 0);
 
         return rc;
@@ -508,7 +510,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
                         resource_size_t len, unsigned int irq)
 {
         u32 vendor, intfcaps, intmask;
-        int rc, i, irq_s, irq_e;
+        int rc, i, irq_s, irq_e, probe;
         struct tpm_chip *chip;
 
         if (!(chip = tpm_register_hardware(dev, &tpm_tis)))
@@ -538,11 +540,12 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
                  vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
 
         if (!itpm) {
-                itpm = probe_itpm(chip);
-                if (itpm < 0) {
+                probe = probe_itpm(chip);
+                if (probe < 0) {
                         rc = -ENODEV;
                         goto out_err;
                 }
+                itpm = (probe == 0) ? 0 : 1;
         }
 
         if (itpm)
@@ -689,9 +692,9 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
         }
 
         INIT_LIST_HEAD(&chip->vendor.list);
-        spin_lock(&tis_lock);
+        mutex_lock(&tis_lock);
         list_add(&chip->vendor.list, &tis_chips);
-        spin_unlock(&tis_lock);
+        mutex_unlock(&tis_lock);
 
 
         return 0;
@@ -855,7 +858,7 @@ static void __exit cleanup_tis(void)
 {
         struct tpm_vendor_specific *i, *j;
         struct tpm_chip *chip;
-        spin_lock(&tis_lock);
+        mutex_lock(&tis_lock);
         list_for_each_entry_safe(i, j, &tis_chips, list) {
                 chip = to_tpm_chip(i);
                 tpm_remove_hardware(chip->dev);
@@ -871,7 +874,7 @@ static void __exit cleanup_tis(void)
                 iounmap(i->iobase);
                 list_del(&i->list);
         }
-        spin_unlock(&tis_lock);
+        mutex_unlock(&tis_lock);
 #ifdef CONFIG_PNP
         if (!force) {
                 pnp_unregister_driver(&tis_pnp_driver);
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index eedd5474850..46b77ede84c 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;