5 files changed, 21 insertions, 46 deletions

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 4e34d3686c23..40834f18754c 100644
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -148,13 +148,12 @@ config VMLOGRDR
           This driver depends on the IUCV support driver.
 
 config VMCP
-        tristate "Support for the z/VM CP interface (VM only)"
+        bool "Support for the z/VM CP interface"
         depends on S390
         help
           Select this option if you want to be able to interact with the control
           program on z/VM
 
-
 config MONREADER
         tristate "API for reading z/VM monitor service records"
         depends on IUCV
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 0eabcca3c92d..857dfcb7b359 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -484,6 +484,7 @@ fs3270_open(struct inode *inode, struct file *filp)
                 raw3270_del_view(&fp->view);
                 goto out;
         }
+        nonseekable_open(inode, filp);
         filp->private_data = fp;
 out:
         mutex_unlock(&fs3270_mutex);
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index cb6bffe7141a..18d9a497863b 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -49,7 +49,7 @@ static unsigned char ret_diacr[NR_DEAD] = {
 struct kbd_data *
 kbd_alloc(void) {
         struct kbd_data *kbd;
-        int i, len;
+        int i;
 
         kbd = kzalloc(sizeof(struct kbd_data), GFP_KERNEL);
         if (!kbd)
@@ -59,12 +59,11 @@ kbd_alloc(void) {
                 goto out_kbd;
         for (i = 0; i < ARRAY_SIZE(key_maps); i++) {
                 if (key_maps[i]) {
-                        kbd->key_maps[i] =
-                                kmalloc(sizeof(u_short)*NR_KEYS, GFP_KERNEL);
+                        kbd->key_maps[i] = kmemdup(key_maps[i],
+                                                   sizeof(u_short) * NR_KEYS,
+                                                   GFP_KERNEL);
                         if (!kbd->key_maps[i])
                                 goto out_maps;
-                        memcpy(kbd->key_maps[i], key_maps[i],
-                               sizeof(u_short)*NR_KEYS);
                 }
         }
         kbd->func_table = kzalloc(sizeof(func_table), GFP_KERNEL);
@@ -72,23 +71,21 @@ kbd_alloc(void) {
                 goto out_maps;
         for (i = 0; i < ARRAY_SIZE(func_table); i++) {
                 if (func_table[i]) {
-                        len = strlen(func_table[i]) + 1;
-                        kbd->func_table[i] = kmalloc(len, GFP_KERNEL);
+                        kbd->func_table[i] = kstrdup(func_table[i],
+                                                     GFP_KERNEL);
                         if (!kbd->func_table[i])
                                 goto out_func;
-                        memcpy(kbd->func_table[i], func_table[i], len);
                 }
         }
         kbd->fn_handler =
                 kzalloc(sizeof(fn_handler_fn *) * NR_FN_HANDLER, GFP_KERNEL);
         if (!kbd->fn_handler)
                 goto out_func;
-        kbd->accent_table =
-                kmalloc(sizeof(struct kbdiacruc)*MAX_DIACR, GFP_KERNEL);
+        kbd->accent_table = kmemdup(accent_table,
+                                    sizeof(struct kbdiacruc) * MAX_DIACR,
+                                    GFP_KERNEL);
         if (!kbd->accent_table)
                 goto out_fn_handler;
-        memcpy(kbd->accent_table, accent_table,
-               sizeof(struct kbdiacruc)*MAX_DIACR);
         kbd->accent_table_size = accent_table_size;
         return kbd;
 
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 5bb59d36a6d4..04e532eec032 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -1,24 +1,20 @@
 /*
- * Copyright IBM Corp. 2004,2007
+ * Copyright IBM Corp. 2004,2010
  * Interface implementation for communication with the z/VM control program
- * Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
  *
+ * Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
  *
  * z/VMs CP offers the possibility to issue commands via the diagnose code 8
  * this driver implements a character device that issues these commands and
  * returns the answer of CP.
-
+ *
  * The idea of this driver is based on cpint from Neale Ferguson and #CP in CMS
  */
 
-#define KMSG_COMPONENT "vmcp"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <asm/compat.h>
 #include <asm/cpcmd.h>
@@ -26,10 +22,6 @@
 #include <asm/uaccess.h>
 #include "vmcp.h"
 
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Christian Borntraeger <borntraeger@de.ibm.com>");
-MODULE_DESCRIPTION("z/VM CP interface");
-
 static debug_info_t *vmcp_debug;
 
 static int vmcp_open(struct inode *inode, struct file *file)
@@ -197,11 +189,8 @@ static int __init vmcp_init(void)
 {
         int ret;
 
-        if (!MACHINE_IS_VM) {
-                pr_warning("The z/VM CP interface device driver cannot be "
-                           "loaded without z/VM\n");
-                return -ENODEV;
-        }
+        if (!MACHINE_IS_VM)
+                return 0;
 
         vmcp_debug = debug_register("vmcp", 1, 1, 240);
         if (!vmcp_debug)
@@ -214,19 +203,8 @@ static int __init vmcp_init(void)
         }
 
         ret = misc_register(&vmcp_dev);
-        if (ret) {
+        if (ret)
                 debug_unregister(vmcp_debug);
-                return ret;
-        }
-
-        return 0;
-}
-
-static void __exit vmcp_exit(void)
-{
-        misc_deregister(&vmcp_dev);
-        debug_unregister(vmcp_debug);
+        return ret;
 }
-
-module_init(vmcp_init);
-module_exit(vmcp_exit);
+device_initcall(vmcp_init);
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 7217966f7d31..f5ea3384a4b9 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -445,7 +445,7 @@ static int zcore_memmap_open(struct inode *inode, struct file *filp)
         }
         kfree(chunk_array);
         filp->private_data = buf;
-        return 0;
+        return nonseekable_open(inode, filp);
 }
 
 static int zcore_memmap_release(struct inode *inode, struct file *filp)
@@ -473,7 +473,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf,
 
 static int zcore_reipl_open(struct inode *inode, struct file *filp)
 {
-        return 0;
+        return nonseekable_open(inode, filp);
 }
 
 static int zcore_reipl_release(struct inode *inode, struct file *filp)