3 files changed, 41 insertions, 14 deletions

diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 7fbd017153ee..1a89d989f348 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -114,11 +114,20 @@ do { \
         debug_event(claw_dbf_##name,level,(void*)(addr),len); \
 } while (0)
 
+/* Allow to sort out low debug levels early to avoid wasted sprints */
+static inline int claw_dbf_passes(debug_info_t *dbf_grp, int level)
+{
+        return (level <= dbf_grp->level);
+}
+
 #define CLAW_DBF_TEXT_(level,name,text...) \
-do {                                       \
-        sprintf(debug_buffer, text);  \
-                debug_text_event(claw_dbf_##name,level, debug_buffer);\
-} while (0)
+        do { \
+                if (claw_dbf_passes(claw_dbf_##name, level)) { \
+                        sprintf(debug_buffer, text); \
+                        debug_text_event(claw_dbf_##name, level, \
+                                                debug_buffer); \
+                } \
+        } while (0)
 
 /*******************************************************
 *  Define Control Blocks                               *
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 8976fb0b070a..d58fea52557d 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -16,11 +16,19 @@ do { \
         debug_event(lcs_dbf_##name,level,(void*)(addr),len); \
 } while (0)
 
+/* Allow to sort out low debug levels early to avoid wasted sprints */
+static inline int lcs_dbf_passes(debug_info_t *dbf_grp, int level)
+{
+        return (level <= dbf_grp->level);
+}
+
 #define LCS_DBF_TEXT_(level,name,text...) \
-do {                                       \
-        sprintf(debug_buffer, text);  \
-                debug_text_event(lcs_dbf_##name,level, debug_buffer);\
-} while (0)
+        do { \
+                if (lcs_dbf_passes(lcs_dbf_##name, level)) { \
+                        sprintf(debug_buffer, text); \
+                        debug_text_event(lcs_dbf_##name, level, debug_buffer); \
+                } \
+        } while (0)
 
 /**
  *      sysfs related stuff
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 42d701b5921c..874a19994489 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -97,12 +97,22 @@ MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver");
 
 DECLARE_PER_CPU(char[256], iucv_dbf_txt_buf);
 
-#define IUCV_DBF_TEXT_(name,level,text...)                              \
-        do {                                                            \
-                char* iucv_dbf_txt_buf = get_cpu_var(iucv_dbf_txt_buf); \
-                sprintf(iucv_dbf_txt_buf, text);                        \
-                debug_text_event(iucv_dbf_##name,level,iucv_dbf_txt_buf); \
-                put_cpu_var(iucv_dbf_txt_buf);                          \
+/* Allow to sort out low debug levels early to avoid wasted sprints */
+static inline int iucv_dbf_passes(debug_info_t *dbf_grp, int level)
+{
+        return (level <= dbf_grp->level);
+}
+
+#define IUCV_DBF_TEXT_(name, level, text...) \
+        do { \
+                if (iucv_dbf_passes(iucv_dbf_##name, level)) { \
+                        char* iucv_dbf_txt_buf = \
+                                        get_cpu_var(iucv_dbf_txt_buf); \
+                        sprintf(iucv_dbf_txt_buf, text); \
+                        debug_text_event(iucv_dbf_##name, level, \
+                                                iucv_dbf_txt_buf); \
+                        put_cpu_var(iucv_dbf_txt_buf); \
+                } \
         } while (0)
 
 #define IUCV_DBF_SPRINTF(name,level,text...) \