diff options
Diffstat (limited to 'drivers/usb/storage/debug.h')
-rw-r--r-- | drivers/usb/storage/debug.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h index d4280e1541a3..b1273f03e223 100644 --- a/drivers/usb/storage/debug.h +++ b/drivers/usb/storage/debug.h | |||
@@ -47,17 +47,20 @@ | |||
47 | #define USB_STORAGE "usb-storage: " | 47 | #define USB_STORAGE "usb-storage: " |
48 | 48 | ||
49 | #ifdef CONFIG_USB_STORAGE_DEBUG | 49 | #ifdef CONFIG_USB_STORAGE_DEBUG |
50 | void usb_stor_show_command(struct scsi_cmnd *srb); | 50 | void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb); |
51 | void usb_stor_show_sense( unsigned char key, | 51 | void usb_stor_show_sense(const struct us_data *us, unsigned char key, |
52 | unsigned char asc, unsigned char ascq ); | 52 | unsigned char asc, unsigned char ascq); |
53 | __printf(1, 2) int usb_stor_dbg(const char *fmt, ...); | 53 | __printf(2, 3) int usb_stor_dbg(const struct us_data *us, |
54 | const char *fmt, ...); | ||
54 | 55 | ||
55 | #define US_DEBUGP(fmt, ...) usb_stor_dbg(fmt, ##__VA_ARGS__) | ||
56 | #define US_DEBUGPX(fmt, ...) printk(fmt, ##__VA_ARGS__) | 56 | #define US_DEBUGPX(fmt, ...) printk(fmt, ##__VA_ARGS__) |
57 | #define US_DEBUG(x) x | 57 | #define US_DEBUG(x) x |
58 | #else | 58 | #else |
59 | #define US_DEBUGP(fmt, ...) \ | 59 | __printf(2, 3) |
60 | do { if (0) printk(fmt, ##__VA_ARGS__); } while (0) | 60 | static inline int _usb_stor_dbg(const struct us_data *us, |
61 | const char *fmt, ...) {return 1;} | ||
62 | #define usb_stor_dbg(us, fmt, ...) \ | ||
63 | do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0) | ||
61 | #define US_DEBUGPX(fmt, ...) \ | 64 | #define US_DEBUGPX(fmt, ...) \ |
62 | do { if (0) printk(fmt, ##__VA_ARGS__); } while (0) | 65 | do { if (0) printk(fmt, ##__VA_ARGS__); } while (0) |
63 | #define US_DEBUG(x) | 66 | #define US_DEBUG(x) |