lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: Convert concatenated __FILE__ to %s, __FILE__

Browse Source 
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>
This commit is contained in:
Joe Perches
2010-02-05 17:51:13 -08:00
committed by Greg Kroah-Hartman
parent 759f363426
commit f45ba776da
11 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/misc/adutux.c
View File

@ -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");

2
drivers/usb/misc/ldusb.c
View File

@ -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;
}

11
drivers/usb/misc/legousbtower.c
View File

@ -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;
}