Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[sfrench/cifs-2.6.git] / drivers / usb / gadget / fsl_usb2_udc.h

diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index c6291e046507776594fc4beecfa88b2acfdcfa23..98b1483ef6a511459e44b2b8f17ada3329570ec1 100644 (file)
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -101,6 +101,10 @@ struct usb_sys_interface {
 #define WAIT_FOR_OUT_STATUS     3
 #define DATA_STATE_RECV         4
 
+/* Device Controller Capability Parameter register */
+#define DCCPARAMS_DC                           0x00000080
+#define DCCPARAMS_DEN_MASK                     0x0000001f
+
 /* Frame Index Register Bit Masks */
 #define        USB_FRINDEX_MASKS                       0x3fff
 /* USB CMD  Register Bit Masks */
@@ -508,7 +512,7 @@ struct fsl_udc {
 
 #ifdef DEBUG
 #define DBG(fmt, args...)      printk(KERN_DEBUG "[%s]  " fmt "\n", \
-                               __FUNCTION__, ## args)
+                               __func__, ## args)
 #else
 #define DBG(fmt, args...)      do{}while(0)
 #endif
@@ -547,9 +551,9 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
 #define VDBG(stuff...) do{}while(0)
 #endif
 
-#define ERR(stuff...)          printk(KERN_ERR "udc: " stuff)
-#define WARN(stuff...)         printk(KERN_WARNING "udc: " stuff)
-#define INFO(stuff...)         printk(KERN_INFO "udc: " stuff)
+#define ERR(stuff...)          pr_err("udc: " stuff)
+#define WARN(stuff...)         pr_warning("udc: " stuff)
+#define INFO(stuff...)         pr_info("udc: " stuff)
 
 /*-------------------------------------------------------------------------*/