Merge tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / drivers / usb / musb / musb_virthub.c

diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 92d5f71..192248f 100644 (file)
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -55,8 +55,7 @@ void musb_host_finish_resume(struct work_struct *work)
 
        power = musb_readb(musb->mregs, MUSB_POWER);
        power &= ~MUSB_POWER_RESUME;
-       dev_dbg(musb->controller, "root port resume stopped, power %02x\n",
-               power);
+       musb_dbg(musb, "root port resume stopped, power %02x", power);
        musb_writeb(musb->mregs, MUSB_POWER, power);
 
        /*
@@ -104,7 +103,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
                                break;
                }
 
-               dev_dbg(musb->controller, "Root port suspended, power %02x\n", power);
+               musb_dbg(musb, "Root port suspended, power %02x", power);
 
                musb->port1_status |= USB_PORT_STAT_SUSPEND;
                switch (musb->xceiv->otg->state) {
@@ -123,7 +122,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
                        musb_platform_try_idle(musb, 0);
                        break;
                default:
-                       dev_dbg(musb->controller, "bogus rh suspend? %s\n",
+                       musb_dbg(musb, "bogus rh suspend? %s",
                                usb_otg_state_string(musb->xceiv->otg->state));
                }
        } else if (power & MUSB_POWER_SUSPENDM) {
@@ -131,7 +130,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
                power |= MUSB_POWER_RESUME;
                musb_writeb(mbase, MUSB_POWER, power);
 
-               dev_dbg(musb->controller, "Root port resuming, power %02x\n", power);
+               musb_dbg(musb, "Root port resuming, power %02x", power);
 
                /* later, GetPortStatus will stop RESUME signaling */
                musb->port1_status |= MUSB_PORT_STAT_RESUME;
@@ -146,7 +145,7 @@ void musb_port_reset(struct musb *musb, bool do_reset)
        void __iomem    *mbase = musb->mregs;
 
        if (musb->xceiv->otg->state == OTG_STATE_B_IDLE) {
-               dev_dbg(musb->controller, "HNP: Returning from HNP; no hub reset from b_idle\n");
+               musb_dbg(musb, "HNP: Returning from HNP; no hub reset from b_idle");
                musb->port1_status &= ~USB_PORT_STAT_RESET;
                return;
        }
@@ -194,7 +193,7 @@ void musb_port_reset(struct musb *musb, bool do_reset)
                schedule_delayed_work(&musb->deassert_reset_work,
                                      msecs_to_jiffies(50));
        } else {
-               dev_dbg(musb->controller, "root port reset stopped\n");
+               musb_dbg(musb, "root port reset stopped");
                musb_platform_pre_root_reset_end(musb);
                musb_writeb(mbase, MUSB_POWER,
                                power & ~MUSB_POWER_RESET);
@@ -202,7 +201,7 @@ void musb_port_reset(struct musb *musb, bool do_reset)
 
                power = musb_readb(mbase, MUSB_POWER);
                if (power & MUSB_POWER_HSMODE) {
-                       dev_dbg(musb->controller, "high-speed device connected\n");
+                       musb_dbg(musb, "high-speed device connected");
                        musb->port1_status |= USB_PORT_STAT_HIGH_SPEED;
                }
 
@@ -242,7 +241,7 @@ void musb_root_disconnect(struct musb *musb)
                musb->xceiv->otg->state = OTG_STATE_B_IDLE;
                break;
        default:
-               dev_dbg(musb->controller, "host disconnect (%s)\n",
+               musb_dbg(musb, "host disconnect (%s)",
                        usb_otg_state_string(musb->xceiv->otg->state));
        }
 }
@@ -337,7 +336,7 @@ int musb_hub_control(
                default:
                        goto error;
                }
-               dev_dbg(musb->controller, "clear feature %d\n", wValue);
+               musb_dbg(musb, "clear feature %d", wValue);
                musb->port1_status &= ~(1 << wValue);
                break;
        case GetHubDescriptor:
@@ -372,8 +371,7 @@ int musb_hub_control(
                                (__le32 *) buf);
 
                /* port change status is more interesting */
-               dev_dbg(musb->controller, "port status %08x\n",
-                               musb->port1_status);
+               musb_dbg(musb, "port status %08x", musb->port1_status);
                break;
        case SetPortFeature:
                if ((wIndex & 0xff) != 1)
@@ -443,7 +441,7 @@ int musb_hub_control(
                default:
                        goto error;
                }
-               dev_dbg(musb->controller, "set feature %d\n", wValue);
+               musb_dbg(musb, "set feature %d", wValue);
                musb->port1_status |= 1 << wValue;
                break;