Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

[pandora-kernel.git] / drivers / usb / musb / musb_virthub.c

diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 489104a..2d80a57 100644 (file)
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -74,7 +74,7 @@ static void musb_port_suspend(struct musb *musb, bool do_suspend)
                                break;
                }
 
-               DBG(3, "Root port suspended, power %02x\n", power);
+               dev_dbg(musb->controller, "Root port suspended, power %02x\n", power);
 
                musb->port1_status |= USB_PORT_STAT_SUSPEND;
                switch (musb->xceiv->state) {
@@ -97,15 +97,15 @@ static void musb_port_suspend(struct musb *musb, bool do_suspend)
                        break;
 #endif
                default:
-                       DBG(1, "bogus rh suspend? %s\n",
-                               otg_state_string(musb));
+                       dev_dbg(musb->controller, "bogus rh suspend? %s\n",
+                               otg_state_string(musb->xceiv->state));
                }
        } else if (power & MUSB_POWER_SUSPENDM) {
                power &= ~MUSB_POWER_SUSPENDM;
                power |= MUSB_POWER_RESUME;
                musb_writeb(mbase, MUSB_POWER, power);
 
-               DBG(3, "Root port resuming, power %02x\n", power);
+               dev_dbg(musb->controller, "Root port resuming, power %02x\n", power);
 
                /* later, GetPortStatus will stop RESUME signaling */
                musb->port1_status |= MUSB_PORT_STAT_RESUME;
@@ -120,7 +120,7 @@ static void musb_port_reset(struct musb *musb, bool do_reset)
 
 #ifdef CONFIG_USB_MUSB_OTG
        if (musb->xceiv->state == OTG_STATE_B_IDLE) {
-               DBG(2, "HNP: Returning from HNP; no hub reset from b_idle\n");
+               dev_dbg(musb->controller, "HNP: Returning from HNP; no hub reset from b_idle\n");
                musb->port1_status &= ~USB_PORT_STAT_RESET;
                return;
        }
@@ -159,7 +159,7 @@ static void musb_port_reset(struct musb *musb, bool do_reset)
                musb->port1_status &= ~USB_PORT_STAT_ENABLE;
                musb->rh_timer = jiffies + msecs_to_jiffies(50);
        } else {
-               DBG(4, "root port reset stopped\n");
+               dev_dbg(musb->controller, "root port reset stopped\n");
                musb_writeb(mbase, MUSB_POWER,
                                power & ~MUSB_POWER_RESET);
 
@@ -167,7 +167,7 @@ static void musb_port_reset(struct musb *musb, bool do_reset)
 
                power = musb_readb(mbase, MUSB_POWER);
                if (power & MUSB_POWER_HSMODE) {
-                       DBG(4, "high-speed device connected\n");
+                       dev_dbg(musb->controller, "high-speed device connected\n");
                        musb->port1_status |= USB_PORT_STAT_HIGH_SPEED;
                }
 
@@ -208,7 +208,8 @@ void musb_root_disconnect(struct musb *musb)
                musb->xceiv->state = OTG_STATE_B_IDLE;
                break;
        default:
-               DBG(1, "host disconnect (%s)\n", otg_state_string(musb));
+               dev_dbg(musb->controller, "host disconnect (%s)\n",
+                       otg_state_string(musb->xceiv->state));
        }
 }
 
@@ -287,7 +288,7 @@ int musb_hub_control(
                default:
                        goto error;
                }
-               DBG(5, "clear feature %d\n", wValue);
+               dev_dbg(musb->controller, "clear feature %d\n", wValue);
                musb->port1_status &= ~(1 << wValue);
                break;
        case GetHubDescriptor:
@@ -329,7 +330,7 @@ int musb_hub_control(
 
                        power = musb_readb(musb->mregs, MUSB_POWER);
                        power &= ~MUSB_POWER_RESUME;
-                       DBG(4, "root port resume stopped, power %02x\n",
+                       dev_dbg(musb->controller, "root port resume stopped, power %02x\n",
                                        power);
                        musb_writeb(musb->mregs, MUSB_POWER, power);
 
@@ -352,7 +353,7 @@ int musb_hub_control(
                                (__le32 *) buf);
 
                /* port change status is more interesting */
-               DBG(get_unaligned((u16 *)(buf+2)) ? 2 : 5, "port status %08x\n",
+               dev_dbg(musb->controller, "port status %08x\n",
                                musb->port1_status);
                break;
        case SetPortFeature:
@@ -423,7 +424,7 @@ int musb_hub_control(
                default:
                        goto error;
                }
-               DBG(5, "set feature %d\n", wValue);
+               dev_dbg(musb->controller, "set feature %d\n", wValue);
                musb->port1_status |= 1 << wValue;
                break;