aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-10-20 23:51:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-03 18:38:17 -0500
commite5283626f5d535c54cbcc3ec4a60a4746578a4c2 (patch)
tree9b33698dab7a42232712ffcc0587c55cd0b7b450 /drivers/usb/storage
parent474fe70bcf04b4d99867bc214c70d45624ab6f6f (diff)
usb: storage: Convert usb_stor_dbg to return void
No caller or macro uses the return value so make it void. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/debug.c7
-rw-r--r--drivers/usb/storage/debug.h10
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index e08f64780e30..05bc379b9e62 100644
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -179,17 +179,14 @@ void usb_stor_show_sense(const struct us_data *us,
179 US_DEBUGPX("\n"); 179 US_DEBUGPX("\n");
180} 180}
181 181
182int usb_stor_dbg(const struct us_data *us, const char *fmt, ...) 182void usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
183{ 183{
184 va_list args; 184 va_list args;
185 int r;
186 185
187 va_start(args, fmt); 186 va_start(args, fmt);
188 187
189 r = dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args); 188 dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
190 189
191 va_end(args); 190 va_end(args);
192
193 return r;
194} 191}
195EXPORT_SYMBOL_GPL(usb_stor_dbg); 192EXPORT_SYMBOL_GPL(usb_stor_dbg);
diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index b1273f03e223..f52520306e1a 100644
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -50,15 +50,17 @@
50void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb); 50void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb);
51void usb_stor_show_sense(const struct us_data *us, unsigned char key, 51void 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(2, 3) int usb_stor_dbg(const struct us_data *us, 53__printf(2, 3) void usb_stor_dbg(const struct us_data *us,
54 const char *fmt, ...); 54 const char *fmt, ...);
55 55
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__printf(2, 3) 59__printf(2, 3)
60static inline int _usb_stor_dbg(const struct us_data *us, 60static inline void _usb_stor_dbg(const struct us_data *us,
61 const char *fmt, ...) {return 1;} 61 const char *fmt, ...)
62{
63}
62#define usb_stor_dbg(us, fmt, ...) \ 64#define usb_stor_dbg(us, fmt, ...) \
63 do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0) 65 do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0)
64#define US_DEBUGPX(fmt, ...) \ 66#define US_DEBUGPX(fmt, ...) \