Commit efcbd3df authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

USB: Extend and neaten dbg macros 



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

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f45ba776

include/linux/usb.h

+9 −5
Original line number Original line Diff line number Diff line
@@ -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;

include/linux/usb/serial.h

+5 −8
Original line number Original line Diff line number Diff line
@@ -354,11 +354,8 @@ static inline void usb_serial_debug_data(int debug, 
#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 */