usb: storage: use usb_store_dbg instead of US_DEBUGPX

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. Remove the macro and use usb_store_dbg instead.

Signed-off-by: Victor Dodon <printesoi@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index 57bf3ad41fb63554ac4ea0bf52b87919e75e3768..5a12c03138f8cc46e336ecad5f155dc120d90801 100644 (file)
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -57,7 +57,6 @@
 void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb)
 {
        char *what = NULL;
-       int i;
 
        switch (srb->cmnd[0]) {
        case TEST_UNIT_READY: what = "TEST_UNIT_READY"; break;
@@ -153,10 +152,8 @@ void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb)
        default: what = "(unknown command)"; break;
        }
        usb_stor_dbg(us, "Command %s (%d bytes)\n", what, srb->cmd_len);
-       usb_stor_dbg(us, "bytes: ");
-       for (i = 0; i < srb->cmd_len && i < 16; i++)
-               US_DEBUGPX(" %02x", srb->cmnd[i]);
-       US_DEBUGPX("\n");
+       usb_stor_dbg(us, "bytes: %*ph\n", min_t(int, srb->cmd_len, 16),
+                    (const unsigned char *)srb->cmnd);
 }
 
 void usb_stor_show_sense(const struct us_data *us,
@@ -174,11 +171,10 @@ void usb_stor_show_sense(const struct us_data *us,
        if (what == NULL)
                what = "(unknown ASC/ASCQ)";
 
-       usb_stor_dbg(us, "%s: ", keystr);
        if (fmt)
-               US_DEBUGPX("%s (%s%x)\n", what, fmt, ascq);
+               usb_stor_dbg(us, "%s: %s (%s%x)\n", keystr, what, fmt, ascq);
        else
-               US_DEBUGPX("%s\n", what);
+               usb_stor_dbg(us, "%s: %s\n", keystr, what);
 }
 
 void usb_stor_dbg(const struct us_data *us, const char *fmt, ...)

diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index f52520306e1a908996c0798b8f5715a7f6cf4fde..6b365ce4e6109748495ada5e5d0c72e3d54ffd2e 100644 (file)
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -53,7 +53,6 @@ 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_DEBUG(x)            x
 #else
 __printf(2, 3)
@@ -63,8 +62,6 @@ 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)
 #define US_DEBUG(x)
 #endif
 

diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index b74603689b9e87f14412b2d20df2b043a47c0453..79224fcf9b592120253d132c34d9e3d764fe635a 100644 (file)
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -1102,24 +1102,24 @@ static int
 sddr09_get_wp(struct us_data *us, struct sddr09_card_info *info) {
        int result;
        unsigned char status;
+       const char *wp_fmt;
 
        result = sddr09_read_status(us, &status);
        if (result) {
                usb_stor_dbg(us, "read_status fails\n");
                return result;
        }
-       usb_stor_dbg(us, "status 0x%02X", status);
        if ((status & 0x80) == 0) {
                info->flags |= SDDR09_WP;       /* write protected */
-               US_DEBUGPX(" WP");
+               wp_fmt = " WP";
+       } else {
+               wp_fmt = "";
        }
-       if (status & 0x40)
-               US_DEBUGPX(" Ready");
-       if (status & LUNBITS)
-               US_DEBUGPX(" Suspended");
-       if (status & 0x1)
-               US_DEBUGPX(" Error");
-       US_DEBUGPX("\n");
+       usb_stor_dbg(us, "status 0x%02X%s%s%s%s\n", status, wp_fmt,
+                    status & 0x40 ? " Ready" : "",
+                    status & LUNBITS ? " Suspended" : "",
+                    status & 0x01 ? " Error" : "");
+
        return 0;
 }