include/linux/usb: Extend and neaten dbg macros
Subsystems (2)
PATCH 1/1 include/linux/usb: Extend and neaten dbg macros
Add format/argument validation for #ifndef DEBUG dbg macro Neaten dbg macro definitions
Signed-off-by Joe Perches <[email protected]>
--- include/linux/usb.h | 14 +++++++++----- include/linux/usb/serial.h | 13 +++++-------- 2 files changed, 14 insertions(+), 13 deletions(-)
include/linux/usb.h +9 -5
@@ -1582,14 +1582,18 @@ extern void usb_register_notify(struct notifier_block *nb);extern void usb_unregister_notify (struct notifier_block *nb);#ifdef DEBUG -#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \ - __FILE__ , ## arg) +#define dbg(format, arg...) \ + printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg)#else -#define dbg(format, arg...) do {} while (0) +#define dbg(format, arg...) \ +do { \ + if (0) \ + printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ +} while (0)#endif -#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \ - format "\n" , ## arg) +#define err(format, arg...) \ + printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)/* debugfs stuff */ extern struct dentry *usb_debug_root;
include/linux/usb/serial.h +5 -8
@@ -351,14 +351,11 @@ static inline void usb_serial_debug_data(int debug,/* Use our own dbg macro */ #undef dbg -#define dbg(format, arg...) \ - do { \ - if (debug) \ - printk(KERN_DEBUG "%s: " format "\n" , __FILE__ , \ - ## arg); \ - } while (0) - - +#define dbg(format, arg...) \ +do { \ + if (debug) \ + printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ +} while (0)#endif /* __LINUX_USB_SERIAL_H */
Signature · 1 line
1.7.0.rc1.33.g07cf0f