TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: Extend and neaten dbg macros

Browse Source 
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>
This commit is contained in:
Joe Perches
2010-02-05 18:09:49 -08:00
committed by Greg Kroah-Hartman
parent f45ba776da
commit efcbd3df07
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/usb.h
View File

@@ -1566,14 +1566,18 @@ extern void usb_register_notify(struct notifier_block *nb);
extern void usb_unregister_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb);
#ifdef DEBUG #ifdef DEBUG
#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \ #define dbg(format, arg...) \
__FILE__ , ## arg) printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg)
#else #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 #endif
#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \ #define err(format, arg...) \
format "\n" , ## arg) printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
/* debugfs stuff */ /* debugfs stuff */
extern struct dentry *usb_debug_root; extern struct dentry *usb_debug_root;

13
include/linux/usb/serial.h
View File

@@ -351,14 +351,11 @@ static inline void usb_serial_debug_data(int debug,
/* Use our own dbg macro */ /* Use our own dbg macro */
#undef dbg #undef dbg
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
if (debug) \ if (debug) \
printk(KERN_DEBUG "%s: " format "\n" , __FILE__ , \ printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
## arg); \ } while (0)
} while (0)
#endif /* __LINUX_USB_SERIAL_H */ #endif /* __LINUX_USB_SERIAL_H */