Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
  USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
  USB: UHCI: Support big endian GRUSBHC HC
  sparc: add {read,write}*_be routines
  USB: UHCI: Add support for big endian descriptors
  USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
  USB: UHCI: Add support for big endian mmio
  usb-storage: Correct adjust_quirks to include latest flags
  usb/isp1760: Fix possible unlink problems
  usb/isp1760: Move function isp1760_endpoint_disable() within file.
  USB: remove remaining usages of hcd->state from usbcore and fix regression
  usb: musb: ux500: add configuration and build options for ux500 dma
  usb: musb: ux500: add dma glue layer for ux500
  usb: musb: ux500: add dma name for ux500
  usb: musb: ux500: add ux500 specific code for gadget side
  usb: musb: fix compile error
  usb-storage: fix up the unusual_realtek device list
  USB: gadget: f_audio: Fix invalid dereference of initdata
  EHCI: don't rescan interrupt QHs needlessly
  OHCI: fix regression caused by nVidia shutdown workaround
  USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
  ...

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index e6de097fb7e..2a2adf6492c 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -220,7 +220,8 @@ static void otg_timer(unsigned long _musb)
         * status change events (from the transceiver) otherwise.
          */
         devctl = musb_readb(mregs, MUSB_DEVCTL);
-        DBG(7, "poll devctl %02x (%s)\n", devctl, otg_state_string(musb));
+        dev_dbg(musb->controller, "poll devctl %02x (%s)\n", devctl,
+                otg_state_string(musb->xceiv->state));
 
         spin_lock_irqsave(&musb->lock, flags);
         switch (musb->xceiv->state) {
@@ -297,7 +298,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
         /* ack and handle non-CPPI interrupts */
         tmp = musb_readl(tibase, DAVINCI_USB_INT_SRC_MASKED_REG);
         musb_writel(tibase, DAVINCI_USB_INT_SRC_CLR_REG, tmp);
-        DBG(4, "IRQ %08x\n", tmp);
+        dev_dbg(musb->controller, "IRQ %08x\n", tmp);
 
         musb->int_rx = (tmp & DAVINCI_USB_RXINT_MASK)
                         >> DAVINCI_USB_RXINT_SHIFT;
@@ -354,9 +355,9 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
                  * (OTG_TIME_A_WAIT_VRISE) but we don't check for that.
                  */
                 davinci_musb_source_power(musb, drvvbus, 0);
-                DBG(2, "VBUS %s (%s)%s, devctl %02x\n",
+                dev_dbg(musb->controller, "VBUS %s (%s)%s, devctl %02x\n",
                                 drvvbus ? "on" : "off",
-                                otg_state_string(musb),
+                                otg_state_string(musb->xceiv->state),
                                 err ? " ERROR" : "",
                                 devctl);
                 retval = IRQ_HANDLED;
@@ -484,7 +485,7 @@ static int davinci_musb_exit(struct musb *musb)
                                 break;
                         if ((devctl & MUSB_DEVCTL_VBUS) != warn) {
                                 warn = devctl & MUSB_DEVCTL_VBUS;
-                                DBG(1, "VBUS %d\n",
+                                dev_dbg(musb->controller, "VBUS %d\n",
                                         warn >> MUSB_DEVCTL_VBUS_SHIFT);
                         }
                         msleep(1000);
@@ -493,7 +494,7 @@ static int davinci_musb_exit(struct musb *musb)
 
                 /* in OTG mode, another host might be connected */
                 if (devctl & MUSB_DEVCTL_VBUS)
-                        DBG(1, "VBUS off timeout (devctl %02x)\n", devctl);
+                        dev_dbg(musb->controller, "VBUS off timeout (devctl %02x)\n", devctl);
         }
 
         phy_off();