selinux: Remove security_ops extern

[linux.git] / drivers / usb / storage / debug.c

diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index 29fe08ffe3c8fdccc6d34b23e1b487bc0ebb2df5..e08f64780e30fb3af660b7066cc14b1f6181417a 100644 (file)
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -42,17 +42,19 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/device.h>
 #include <linux/cdrom.h>
 #include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_dbg.h>
 
+#include "usb.h"
 #include "debug.h"
 #include "scsi.h"
 
 
-void usb_stor_show_command(struct scsi_cmnd *srb)
+void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb)
 {
        char *what = NULL;
        int i;
@@ -150,18 +152,18 @@ void usb_stor_show_command(struct scsi_cmnd *srb)
        case WRITE_LONG_2: what = "WRITE_LONG_2"; break;
        default: what = "(unknown command)"; break;
        }
-       US_DEBUGP("Command %s (%d bytes)\n", what, srb->cmd_len);
-       US_DEBUGP("bytes: ");
+       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");
 }
 
-void usb_stor_show_sense(
-               unsigned char key,
-               unsigned char asc,
-               unsigned char ascq) {
-
+void usb_stor_show_sense(const struct us_data *us,
+                        unsigned char key,
+                        unsigned char asc,
+                        unsigned char ascq)
+{
        const char *what, *keystr;
 
        keystr = scsi_sense_key_string(key);
@@ -172,23 +174,19 @@ void usb_stor_show_sense(
        if (what == NULL)
                what = "(unknown ASC/ASCQ)";
 
-       US_DEBUGP("%s: ", keystr);
+       usb_stor_dbg(us, "%s: ", keystr);
        US_DEBUGPX(what, ascq);
        US_DEBUGPX("\n");
 }
 
-int usb_stor_dbg(const char *fmt, ...)
+int usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
 {
-       struct va_format vaf;
        va_list args;
        int r;
 
        va_start(args, fmt);
 
-       vaf.fmt = fmt;
-       vaf.va = &args;
-
-       r = printk(KERN_DEBUG USB_STORAGE "%pV", &vaf);
+       r = dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
 
        va_end(args);