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>
This commit is contained in:
Victor Dodon
2016-02-17 10:42:37 -08:00
committed by Greg Kroah-Hartman
parent f9cfabcecd
commit ef976ea33b
3 changed files with 13 additions and 20 deletions

View File

@@ -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;
}