Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1331596

[PATCH] usb: storage: make US_DEBUGPX print with LOGLEVEL_DEBUG

Show all headers | View raw

The US_DEBUGPX macro uses printk without specifying a kernel log level, so
the default kernel log level is used, which may not match LOGLEVEL_DEBUG
used in usb_stor_dbg. Use printk_emit with LOGLEVEL_DEBUG instead.

Signed-off-by: Victor Dodon <printesoi@chromium.org>
---
 drivers/usb/storage/debug.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index f525203..fc1c02f 100644
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -43,6 +43,7 @@
 #define _DEBUG_H_
 
 #include <linux/kernel.h>
+#include <linux/printk.h>
 
 #define USB_STORAGE "usb-storage: "
 
@@ -53,7 +54,8 @@ void usb_stor_show_sense(const struct us_data *us, unsigned char key,
 __printf(2, 3) void usb_stor_dbg(const struct us_data *us,
 				 const char *fmt, ...);
 
-#define US_DEBUGPX(fmt, ...)	printk(fmt, ##__VA_ARGS__)
+#define US_DEBUGPX(fmt, ...)					\
+	printk_emit(0, LOGLEVEL_DEBUG, NULL, 0, fmt, ##__VA_ARGS__)
 #define US_DEBUG(x)		x
 #else
 __printf(2, 3)
@@ -64,7 +66,11 @@ static inline void _usb_stor_dbg(const struct us_data *us,
 #define usb_stor_dbg(us, fmt, ...)				\
 	do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0)
 #define US_DEBUGPX(fmt, ...)					\
-	do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
+	do {							\
+		if (0)						\
+			printk_emit(0, LOGLEVEL_DEBUG, NULL, 0,	\
+				    fmt, ##__VA_ARGS__);	\
+	} while (0)
 #define US_DEBUG(x)
 #endif
 
-- 
2.7.0.rc3.207.g0ac5344

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] usb: storage: make US_DEBUGPX print with LOGLEVEL_DEBUG Victor Dodon <printesoi@chromium.org> - 2016-02-11 01:20 +0100
  Re: [PATCH] usb: storage: make US_DEBUGPX print with LOGLEVEL_DEBUG Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 02:30 +0100
    Re: [PATCH] usb: storage: make US_DEBUGPX print with LOGLEVEL_DEBUG Victor Dodon <printesoi@chromium.org> - 2016-02-17 00:50 +0100
      Re: [PATCH] usb: storage: make US_DEBUGPX print with LOGLEVEL_DEBUG Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-17 01:50 +0100

csiph-web