Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / cio_debug.h

diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h
index f88844adae1ba432e58e8f1d3744415062dab1e7..e64e8278c42e9979af1d35fb57c685be02327731 100644 (file)
--- a/drivers/s390/cio/cio_debug.h
+++ b/drivers/s390/cio/cio_debug.h
@@ -8,21 +8,22 @@ 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 { \
+#define CIO_TRACE_EVENT(imp, txt) do {                         \
                debug_text_event(cio_debug_trace_id, imp, txt); \
        } while (0)
 
-#define CIO_MSG_EVENT(imp, args...) do { \
-               debug_sprintf_event(cio_debug_msg_id, imp , ##args); \
+#define CIO_MSG_EVENT(imp, args...) do {                               \
+               debug_sprintf_event(cio_debug_msg_id, imp , ##args);    \
        } while (0)
 
-#define CIO_CRW_EVENT(imp, args...) do { \
-               debug_sprintf_event(cio_debug_crw_id, imp , ##args); \
+#define CIO_CRW_EVENT(imp, args...) do {                               \
+               debug_sprintf_event(cio_debug_crw_id, imp , ##args);    \
        } while (0)
 
-static inline void
-CIO_HEX_EVENT(int level, void *data, int length)
+static inline void CIO_HEX_EVENT(int level, void *data, int length)
 {
+       if (unlikely(!cio_debug_trace_id))
+               return;
        while (length > 0) {
                debug_event(cio_debug_trace_id, level, data, length);
                length -= cio_debug_trace_id->buf_size;
@@ -30,9 +31,4 @@ CIO_HEX_EVENT(int level, void *data, int length)
        }
 }
 
-#define CIO_DEBUG(printk_level,event_level,msg...) ({ \
-       if (cio_show_msg) printk(printk_level msg); \
-       CIO_MSG_EVENT (event_level, msg); \
-})
-
 #endif