USB: Convert concatenated __FILE__ to %s, __FILE__

Reduces string space a bit
Neaten a macro redefine of dbg

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 11 insertions, 8 deletions

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 306e97825b36..d240de097c62 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -38,7 +38,7 @@ static int debug = 1;
 #define dbg(lvl, format, arg...)                                        \
 do {                                                                    \
         if (debug >= lvl)                                               \
-                printk(KERN_DEBUG __FILE__ " : " format " \n", ## arg); \
+                printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
 } while (0)
 
 
@@ -132,8 +132,8 @@ static void adu_debug_data(int level, const char *function, int size,
         if (debug < level)
                 return;
 
-        printk(KERN_DEBUG __FILE__": %s - length = %d, data = ",
-               function, size);
+        printk(KERN_DEBUG "%s: %s - length = %d, data = ",
+               __FILE__, function, size);
         for (i = 0; i < size; ++i)
                 printk("%.2x ", data[i]);
         printk("\n");
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 7c0bd13eccb2..dd41d8710043 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -798,7 +798,7 @@ static int __init ld_usb_init(void)
         /* register this driver with the USB subsystem */
         retval = usb_register(&ld_usb_driver);
         if (retval)
-                err("usb_register failed for the "__FILE__" driver. Error number %d\n", retval);
+                err("usb_register failed for the %s driver. Error number %d\n", __FILE__, retval);
 
         return retval;
 }
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 3d4378fb4410..8547bf9e3175 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -95,8 +95,11 @@
 
 /* Use our own dbg macro */
 #undef dbg
-#define dbg(lvl, format, arg...) do { if (debug >= lvl) printk(KERN_DEBUG  __FILE__ ": " format "\n", ## arg); } while (0)
-
+#define dbg(lvl, format, arg...)                                        \
+do {                                                                    \
+        if (debug >= lvl)                                               \
+                printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
+} while (0)
 
 /* Version Information */
 #define DRIVER_VERSION "v0.96"
@@ -302,7 +305,7 @@ static inline void lego_usb_tower_debug_data (int level, const char *function, i
         if (debug < level)
                 return;
 
-        printk (KERN_DEBUG __FILE__": %s - length = %d, data = ", function, size);
+        printk (KERN_DEBUG "%s: %s - length = %d, data = ", __FILE__, function, size);
         for (i = 0; i < size; ++i) {
                 printk ("%.2x ", data[i]);
         }
@@ -1055,7 +1058,7 @@ static int __init lego_usb_tower_init(void)
         /* register this driver with the USB subsystem */
         result = usb_register(&tower_driver);
         if (result < 0) {
-                err("usb_register failed for the "__FILE__" driver. Error number %d", result);
+                err("usb_register failed for the %s driver. Error number %d", __FILE__, result);
                 retval = -1;
                 goto exit;
         }