12 files changed, 80 insertions, 109 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 30bae6de6a0d..0bd01f49cfd8 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -807,7 +807,7 @@ if RTC_LIB=n
 config RTC
         tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
         depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
-                        && !ARM && !SUPERH && !S390 && !AVR32
+                        && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index abea273dcc2f..8f3d4c184914 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -517,8 +517,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
         if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa))
                 return AE_OK;
 
-        printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n",
-                (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa);
+        printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset "
+                "(ioc=%llx, lba=%llx)\n", (char *)context,
+                sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa);
 
         hp_zx1_gart_found = 1;
         return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 6b900b297cc6..52e06589821d 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -571,7 +571,7 @@ static char dtlk_read_tts(void)
                 portval = inb_p(dtlk_port_tts);
         } while ((portval & TTS_READABLE) == 0 &&
                  retries++ < DTLK_MAX_RETRIES);
-        if (retries == DTLK_MAX_RETRIES)
+        if (retries > DTLK_MAX_RETRIES)
                 printk(KERN_ERR "dtlk_read_tts() timeout\n");
 
         ch = inb_p(dtlk_port_tts);      /* input from TTS port */
@@ -583,7 +583,7 @@ static char dtlk_read_tts(void)
                 portval = inb_p(dtlk_port_tts);
         } while ((portval & TTS_READABLE) != 0 &&
                  retries++ < DTLK_MAX_RETRIES);
-        if (retries == DTLK_MAX_RETRIES)
+        if (retries > DTLK_MAX_RETRIES)
                 printk(KERN_ERR "dtlk_read_tts() timeout\n");
 
         TRACE_RET;
@@ -640,7 +640,7 @@ static char dtlk_write_tts(char ch)
                 while ((inb_p(dtlk_port_tts) & TTS_WRITABLE) == 0 &&
                        retries++ < DTLK_MAX_RETRIES)    /* DT ready? */
                         ;
-        if (retries == DTLK_MAX_RETRIES)
+        if (retries > DTLK_MAX_RETRIES)
                 printk(KERN_ERR "dtlk_write_tts() timeout\n");
 
         outb_p(ch, dtlk_port_tts);      /* output to TTS port */
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index 449727b6166d..936d05bf37fa 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -241,7 +241,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 static struct vio_driver hvc_vio_driver = {
         .id_table       = hvc_driver_table,
         .probe          = hvc_vio_probe,
-        .remove         = hvc_vio_remove,
+        .remove         = __devexit_p(hvc_vio_remove),
         .driver         = {
                 .name   = hvc_driver_name,
                 .owner  = THIS_MODULE,
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index bd62dc86b47d..c72b994652ac 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -113,7 +113,7 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 static struct vio_driver hvc_vio_driver = {
         .id_table       = hvc_driver_table,
         .probe          = hvc_vio_probe,
-        .remove         = hvc_vio_remove,
+        .remove         = __devexit_p(hvc_vio_remove),
         .driver         = {
                 .name   = hvc_driver_name,
                 .owner  = THIS_MODULE,
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index 7d64e4230e66..266b858b8f85 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -868,7 +868,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
 static struct vio_driver hvcs_vio_driver = {
         .id_table       = hvcs_driver_table,
         .probe          = hvcs_probe,
-        .remove         = hvcs_remove,
+        .remove         = __devexit_p(hvcs_remove),
         .driver         = {
                 .name   = hvcs_driver_name,
                 .owner  = THIS_MODULE,
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 4d745a89504f..4159292e35cf 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1593,7 +1593,7 @@ static unsigned int card_count;
 static int __devinit isicom_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
-        unsigned int signature, index;
+        unsigned int uninitialized_var(signature), index;
         int retval = -EPERM;
         struct isi_board *board = NULL;
 
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index e18800c400b1..0c999f5bb3db 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3785,7 +3785,7 @@ err:
         return retval;
 }
 
-static void stli_pciremove(struct pci_dev *pdev)
+static void __devexit stli_pciremove(struct pci_dev *pdev)
 {
         struct stlibrd *brdp = pci_get_drvdata(pdev);
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index f96d0bef855e..afa8813e737a 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -863,59 +863,58 @@ static const struct file_operations kmsg_fops = {
         .write =        kmsg_write,
 };
 
-static int memory_open(struct inode * inode, struct file * filp)
-{
-        int ret = 0;
-
-        lock_kernel();
-        switch (iminor(inode)) {
-                case 1:
-                        filp->f_op = &mem_fops;
-                        filp->f_mapping->backing_dev_info =
-                                &directly_mappable_cdev_bdi;
-                        break;
+static const struct {
+        unsigned int            minor;
+        char                    *name;
+        umode_t                 mode;
+        const struct file_operations    *fops;
+        struct backing_dev_info *dev_info;
+} devlist[] = { /* list of minor devices */
+        {1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops,
+                &directly_mappable_cdev_bdi},
 #ifdef CONFIG_DEVKMEM
-                case 2:
-                        filp->f_op = &kmem_fops;
-                        filp->f_mapping->backing_dev_info =
-                                &directly_mappable_cdev_bdi;
-                        break;
+        {2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops,
+                &directly_mappable_cdev_bdi},
 #endif
-                case 3:
-                        filp->f_op = &null_fops;
-                        break;
+        {3, "null",    S_IRUGO | S_IWUGO,           &null_fops, NULL},
 #ifdef CONFIG_DEVPORT
-                case 4:
-                        filp->f_op = &port_fops;
-                        break;
+        {4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops, NULL},
 #endif
-                case 5:
-                        filp->f_mapping->backing_dev_info = &zero_bdi;
-                        filp->f_op = &zero_fops;
-                        break;
-                case 7:
-                        filp->f_op = &full_fops;
-                        break;
-                case 8:
-                        filp->f_op = &random_fops;
-                        break;
-                case 9:
-                        filp->f_op = &urandom_fops;
-                        break;
-                case 11:
-                        filp->f_op = &kmsg_fops;
-                        break;
+        {5, "zero",    S_IRUGO | S_IWUGO,           &zero_fops, &zero_bdi},
+        {7, "full",    S_IRUGO | S_IWUGO,           &full_fops, NULL},
+        {8, "random",  S_IRUGO | S_IWUSR,           &random_fops, NULL},
+        {9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops, NULL},
+        {11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops, NULL},
 #ifdef CONFIG_CRASH_DUMP
-                case 12:
-                        filp->f_op = &oldmem_fops;
-                        break;
+        {12,"oldmem",    S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops, NULL},
 #endif
-                default:
-                        unlock_kernel();
-                        return -ENXIO;
+};
+
+static int memory_open(struct inode *inode, struct file *filp)
+{
+        int ret = 0;
+        int i;
+
+        lock_kernel();
+
+        for (i = 0; i < ARRAY_SIZE(devlist); i++) {
+                if (devlist[i].minor == iminor(inode)) {
+                        filp->f_op = devlist[i].fops;
+                        if (devlist[i].dev_info) {
+                                filp->f_mapping->backing_dev_info =
+                                        devlist[i].dev_info;
+                        }
+
+                        break;
+                }
         }
-        if (filp->f_op && filp->f_op->open)
-                ret = filp->f_op->open(inode,filp);
+
+        if (i == ARRAY_SIZE(devlist))
+                ret = -ENXIO;
+        else
+                if (filp->f_op && filp->f_op->open)
+                        ret = filp->f_op->open(inode, filp);
+
         unlock_kernel();
         return ret;
 }
@@ -924,30 +923,6 @@ static const struct file_operations memory_fops = {
         .open           = memory_open,  /* just a selector for the real open */
 };
 
-static const struct {
-        unsigned int            minor;
-        char                    *name;
-        umode_t                 mode;
-        const struct file_operations    *fops;
-} devlist[] = { /* list of minor devices */
-        {1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
-#ifdef CONFIG_DEVKMEM
-        {2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops},
-#endif
-        {3, "null",    S_IRUGO | S_IWUGO,           &null_fops},
-#ifdef CONFIG_DEVPORT
-        {4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
-#endif
-        {5, "zero",    S_IRUGO | S_IWUGO,           &zero_fops},
-        {7, "full",    S_IRUGO | S_IWUGO,           &full_fops},
-        {8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
-        {9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
-        {11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
-#ifdef CONFIG_CRASH_DUMP
-        {12,"oldmem",    S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops},
-#endif
-};
-
 static struct class *mem_class;
 
 static int __init chr_dev_init(void)
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 65b6ff2442c6..6799588b0099 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -1189,6 +1189,11 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
                 return -ENODEV;
         }
 
+        if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) {
+                retval = -ENODEV;
+                goto out_unlock;
+        }
+
         ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
         ch->port.count++;
         tty->driver_data = ch;
@@ -1213,8 +1218,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
                                 moxa_close_port(tty);
         } else
                 ch->port.flags |= ASYNC_NORMAL_ACTIVE;
+out_unlock:
         mutex_unlock(&moxa_openlock);
-
         return retval;
 }
 
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index c84c34fb1231..432655bcb04c 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -114,8 +114,7 @@ static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
 
         if (!(pp->flags & PP_CLAIMED)) {
                 /* Don't have the port claimed */
-                printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                        minor);
+                pr_debug(CHRDEV "%x: claim the port first\n", minor);
                 return -EINVAL;
         }
 
@@ -198,8 +197,7 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
 
         if (!(pp->flags & PP_CLAIMED)) {
                 /* Don't have the port claimed */
-                printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                        minor);
+                pr_debug(CHRDEV "%x: claim the port first\n", minor);
                 return -EINVAL;
         }
 
@@ -313,7 +311,7 @@ static int register_device (int minor, struct pp_struct *pp)
         }
 
         pp->pdev = pdev;
-        printk (KERN_DEBUG "%s: registered pardevice\n", name);
+        pr_debug("%s: registered pardevice\n", name);
         return 0;
 }
 
@@ -343,8 +341,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 int ret;
 
                 if (pp->flags & PP_CLAIMED) {
-                        printk (KERN_DEBUG CHRDEV
-                                "%x: you've already got it!\n", minor);
+                        pr_debug(CHRDEV "%x: you've already got it!\n", minor);
                         return -EINVAL;
                 }
 
@@ -379,7 +376,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
             }
         case PPEXCL:
                 if (pp->pdev) {
-                        printk (KERN_DEBUG CHRDEV "%x: too late for PPEXCL; "
+                        pr_debug(CHRDEV "%x: too late for PPEXCL; "
                                 "already registered\n", minor);
                         if (pp->flags & PP_EXCL)
                                 /* But it's not really an error. */
@@ -491,8 +488,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         /* Everything else requires the port to be claimed, so check
          * that now. */
         if ((pp->flags & PP_CLAIMED) == 0) {
-                printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                        minor);
+                pr_debug(CHRDEV "%x: claim the port first\n", minor);
                 return -EINVAL;
         }
 
@@ -624,8 +620,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 return 0;
 
         default:
-                printk (KERN_DEBUG CHRDEV "%x: What? (cmd=0x%x)\n", minor,
-                        cmd);
+                pr_debug(CHRDEV "%x: What? (cmd=0x%x)\n", minor, cmd);
                 return -EINVAL;
         }
 
@@ -698,9 +693,8 @@ static int pp_release (struct inode * inode, struct file * file)
         }
         if (compat_negot) {
                 parport_negotiate (pp->pdev->port, IEEE1284_MODE_COMPAT);
-                printk (KERN_DEBUG CHRDEV
-                        "%x: negotiated back to compatibility mode because "
-                        "user-space forgot\n", minor);
+                pr_debug(CHRDEV "%x: negotiated back to compatibility "
+                        "mode because user-space forgot\n", minor);
         }
 
         if (pp->flags & PP_CLAIMED) {
@@ -713,7 +707,7 @@ static int pp_release (struct inode * inode, struct file * file)
                 info->phase = pp->saved_state.phase;
                 parport_release (pp->pdev);
                 if (compat_negot != 1) {
-                        printk (KERN_DEBUG CHRDEV "%x: released pardevice "
+                        pr_debug(CHRDEV "%x: released pardevice "
                                 "because user-space forgot\n", minor);
                 }
         }
@@ -723,8 +717,7 @@ static int pp_release (struct inode * inode, struct file * file)
                 parport_unregister_device (pp->pdev);
                 kfree (name);
                 pp->pdev = NULL;
-                printk (KERN_DEBUG CHRDEV "%x: unregistered pardevice\n",
-                        minor);
+                pr_debug(CHRDEV "%x: unregistered pardevice\n", minor);
         }
 
         kfree (pp);
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 39a05b5fa9cb..0db35857e4d8 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -121,20 +121,17 @@ static struct sysrq_key_op sysrq_unraw_op = {
 #define sysrq_unraw_op (*(struct sysrq_key_op *)0)
 #endif /* CONFIG_VT */
 
-#ifdef CONFIG_KEXEC
-static void sysrq_handle_crashdump(int key, struct tty_struct *tty)
+static void sysrq_handle_crash(int key, struct tty_struct *tty)
 {
-        crash_kexec(get_irq_regs());
+        char *killer = NULL;
+        *killer = 1;
 }
 static struct sysrq_key_op sysrq_crashdump_op = {
-        .handler        = sysrq_handle_crashdump,
-        .help_msg       = "Crashdump",
-        .action_msg     = "Trigger a crashdump",
+        .handler        = sysrq_handle_crash,
+        .help_msg       = "Crash",
+        .action_msg     = "Trigger a crash",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
-#else
-#define sysrq_crashdump_op (*(struct sysrq_key_op *)0)
-#endif
 
 static void sysrq_handle_reboot(int key, struct tty_struct *tty)
 {