Merge bk://linuxusb.bkbits.net/linus-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

drivers/usb/host/ehci-dbg.c

@@ -18,38 +18,14 @@
 
 /* this file is part of ehci-hcd.c */
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,50)
-
-#define ehci_dbg(ehci, fmt, args...) \
-	dev_dbg ((ehci)->hcd.controller, fmt, ## args )
-#define ehci_err(ehci, fmt, args...) \
-	dev_err ((ehci)->hcd.controller, fmt, ## args )
-#define ehci_info(ehci, fmt, args...) \
-	dev_info ((ehci)->hcd.controller, fmt, ## args )
-#define ehci_warn(ehci, fmt, args...) \
-	dev_warn ((ehci)->hcd.controller, fmt, ## args )
-
-#else
-
-#ifdef DEBUG
 #define ehci_dbg(ehci, fmt, args...) \
-	printk(KERN_DEBUG "%s %s: " fmt, hcd_name, \
-		(ehci)->hcd.pdev->slot_name, ## args )
-#else
-#define ehci_dbg(ehci, fmt, args...) do { } while (0)
-#endif
-
+	dev_dbg ((ehci)->hcd.controller , fmt , ## args )
 #define ehci_err(ehci, fmt, args...) \
-	printk(KERN_ERR "%s %s: " fmt, hcd_name, \
-		(ehci)->hcd.pdev->slot_name, ## args )
+	dev_err ((ehci)->hcd.controller , fmt , ## args )
 #define ehci_info(ehci, fmt, args...) \
-	printk(KERN_INFO "%s %s: " fmt, hcd_name, \
-		(ehci)->hcd.pdev->slot_name, ## args )
+	dev_info ((ehci)->hcd.controller , fmt , ## args )
 #define ehci_warn(ehci, fmt, args...) \
-	printk(KERN_WARNING "%s %s: " fmt, hcd_name, \
-		(ehci)->hcd.pdev->slot_name, ## args )
-#endif
-
+	dev_warn ((ehci)->hcd.controller , fmt , ## args )
 
 #ifdef EHCI_VERBOSE_DEBUG
 #	define vdbg dbg