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>

diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index e08f64780e30fb3af660b7066cc14b1f6181417a..05bc379b9e62a229c0a73b9b9e2cf49144eed316 100644 (file)
--- 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,
        US_DEBUGPX("\n");
 }
 
-int usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
+void usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
 {
        va_list args;
-       int r;
 
        va_start(args, fmt);
 
-       r = dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
+       dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
 
        va_end(args);
-
-       return r;
 }
 EXPORT_SYMBOL_GPL(usb_stor_dbg);

diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index b1273f03e223f1cc265565276663524527828be3..f52520306e1a908996c0798b8f5715a7f6cf4fde 100644 (file)
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -50,15 +50,17 @@
 void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb);
 void usb_stor_show_sense(const struct us_data *us, unsigned char key,
                         unsigned char asc, unsigned char ascq);
-__printf(2, 3) int usb_stor_dbg(const struct us_data *us,
-                               const char *fmt, ...);
+__printf(2, 3) void usb_stor_dbg(const struct us_data *us,
+                                const char *fmt, ...);
 
 #define US_DEBUGPX(fmt, ...)   printk(fmt, ##__VA_ARGS__)
 #define US_DEBUG(x)            x
 #else
 __printf(2, 3)
-static inline int _usb_stor_dbg(const struct us_data *us,
-                               const char *fmt, ...) {return 1;}
+static inline void _usb_stor_dbg(const struct us_data *us,
+                                const char *fmt, ...)
+{
+}
 #define usb_stor_dbg(us, fmt, ...)                             \
        do { if (0) _usb_stor_dbg(us, fmt, ##__VA_ARGS__); } while (0)
 #define US_DEBUGPX(fmt, ...)                                   \