3 files changed, 17 insertions, 11 deletions

diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index cb8e2e672b68..0960bef7b199 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -414,11 +414,11 @@ cio_ignore_proc_init (void)
         entry = create_proc_entry ("cio_ignore", S_IFREG | S_IRUGO | S_IWUSR,
                                    &proc_root);
         if (!entry)
-                return 0;
+                return -ENOENT;
 
         entry->proc_fops = &cio_ignore_proc_fops;
 
-        return 1;
+        return 0;
 }
 
 __initcall (cio_ignore_proc_init);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index cbb86fa5f293..5b20d8c9c025 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -67,7 +67,7 @@ cio_debug_init (void)
                 goto out_unregister;
         debug_register_view (cio_debug_msg_id, &debug_sprintf_view);
         debug_set_level (cio_debug_msg_id, 2);
-        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 8);
+        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 16);
         if (!cio_debug_trace_id)
                 goto out_unregister;
         debug_register_view (cio_debug_trace_id, &debug_hex_ascii_view);
diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h
index 6af8b27d366b..f88844adae1b 100644
--- a/drivers/s390/cio/cio_debug.h
+++ b/drivers/s390/cio/cio_debug.h
@@ -3,6 +3,11 @@
 
 #include <asm/debug.h>
 
+/* for use of debug feature */
+extern debug_info_t *cio_debug_msg_id;
+extern debug_info_t *cio_debug_trace_id;
+extern debug_info_t *cio_debug_crw_id;
+
 #define CIO_TRACE_EVENT(imp, txt) do { \
                 debug_text_event(cio_debug_trace_id, imp, txt); \
         } while (0)
@@ -15,18 +20,19 @@
                 debug_sprintf_event(cio_debug_crw_id, imp , ##args); \
         } while (0)
 
-#define CIO_HEX_EVENT(imp, args...) do { \
-                debug_event(cio_debug_trace_id, imp, ##args); \
-        } while (0)
+static inline void
+CIO_HEX_EVENT(int level, void *data, int length)
+{
+        while (length > 0) {
+                debug_event(cio_debug_trace_id, level, data, length);
+                length -= cio_debug_trace_id->buf_size;
+                data += cio_debug_trace_id->buf_size;
+        }
+}
 
 #define CIO_DEBUG(printk_level,event_level,msg...) ({ \
         if (cio_show_msg) printk(printk_level msg); \
         CIO_MSG_EVENT (event_level, msg); \
 })
 
-/* for use of debug feature */
-extern debug_info_t *cio_debug_msg_id;
-extern debug_info_t *cio_debug_trace_id;
-extern debug_info_t *cio_debug_crw_id;
-
 #endif