scsi: use sdev as argument for sense code printing

We should be using the standard dev_printk() variants for
sense code printing.

[hch: remove __scsi_print_sense call in xen-scsiback, Acked by Juergen]
[hch: folded bracing fix from Dan Carpenter]
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index e08f64780e30..66a684a29938 100644
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -164,10 +164,10 @@ void usb_stor_show_sense(const struct us_data *us,
                          unsigned char asc,
                          unsigned char ascq)
 {
-        const char *what, *keystr;
+        const char *what, *keystr, *fmt;
 
         keystr = scsi_sense_key_string(key);
-        what = scsi_extd_sense_format(asc, ascq);
+        what = scsi_extd_sense_format(asc, ascq, &fmt);
 
         if (keystr == NULL)
                 keystr = "(Unknown Key)";
@@ -175,8 +175,10 @@ void usb_stor_show_sense(const struct us_data *us,
                 what = "(unknown ASC/ASCQ)";
 
         usb_stor_dbg(us, "%s: ", keystr);
-        US_DEBUGPX(what, ascq);
-        US_DEBUGPX("\n");
+        if (fmt)
+                US_DEBUGPX("%s (%s%x)\n", what, fmt, ascq);
+        else
+                US_DEBUGPX("%s\n", what);
 }
 
 int usb_stor_dbg(const struct us_data *us, const char *fmt, ...)