tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

USB: Extend and neaten dbg macros

Add format/argument validation for #ifndef DEBUG dbg macro
Neaten dbg macro definitions

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

authored by

Joe Perches and committed by
Greg Kroah-Hartman efcbd3df f45ba776

+14 -13
+9 -5
include/linux/usb.h
··· 1566 1566 extern void usb_unregister_notify(struct notifier_block *nb); 1567 1567 1568 1568 #ifdef DEBUG 1569 - #define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \ 1570 - __FILE__ , ## arg) 1569 + #define dbg(format, arg...) \ 1570 + printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg) 1571 1571 #else 1572 - #define dbg(format, arg...) do {} while (0) 1572 + #define dbg(format, arg...) \ 1573 + do { \ 1574 + if (0) \ 1575 + printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ 1576 + } while (0) 1573 1577 #endif 1574 1578 1575 - #define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \ 1576 - format "\n" , ## arg) 1579 + #define err(format, arg...) \ 1580 + printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg) 1577 1581 1578 1582 /* debugfs stuff */ 1579 1583 extern struct dentry *usb_debug_root;
+5 -8
include/linux/usb/serial.h
··· 351 351 352 352 /* Use our own dbg macro */ 353 353 #undef dbg 354 - #define dbg(format, arg...) \ 355 - do { \ 356 - if (debug) \ 357 - printk(KERN_DEBUG "%s: " format "\n" , __FILE__ , \ 358 - ## arg); \ 359 - } while (0) 360 - 361 - 354 + #define dbg(format, arg...) \ 355 + do { \ 356 + if (debug) \ 357 + printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ 358 + } while (0) 362 359 363 360 #endif /* __LINUX_USB_SERIAL_H */ 364 361