patch-2.3.38 linux/drivers/usb/usb.h

Next file: linux/drivers/usb/usb_scsi.c
Previous file: linux/drivers/usb/usb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.37/linux/drivers/usb/usb.h linux/drivers/usb/usb.h
@@ -5,7 +5,6 @@
 #include <linux/ioctl.h>
 #include <linux/version.h>
 
-
 /* USB constants */
 
 /*
@@ -784,13 +783,15 @@
 void usb_show_device(struct usb_device *);
 void usb_show_string(struct usb_device *dev, char *id, int index);
 
-#ifdef USB_DEBUG
-#define PRINTD(format, args...) printk(KERN_DEBUG "usb: " format "\n" , ## args);
-#else /* NOT DEBUGGING */
-#define PRINTD(fmt, arg...) do {} while (0)
-#endif /* USB_DEBUG */
-/* A simple way to change one line from DEBUG to NOT DEBUG: */
-#define XPRINTD(fmt, arg...)	do {} while (0)
+#ifdef DEBUG
+#define dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "\n", ## arg)
+#else
+#define dbg(format, arg...)
+#endif
+#define err(format, arg...) printk(KERN_ERR __FILE__ ": " format "\n", ## arg)
+#define info(format, arg...) printk(KERN_INFO __FILE__ ": " format "\n", ## arg)
+#define warn(format, arg...) printk(KERN_WARNING __FILE__ ": " format "\n", ## arg)
+
 
 /*
  * procfs stuff

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)