diff options
Diffstat (limited to 'drivers/usb/musb/am35x.c')
-rw-r--r-- | drivers/usb/musb/am35x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index 9e6209f87d3b..23ac28f98d91 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c | |||
@@ -151,7 +151,7 @@ static void otg_timer(unsigned long _musb) | |||
151 | * status change events (from the transceiver) otherwise. | 151 | * status change events (from the transceiver) otherwise. |
152 | */ | 152 | */ |
153 | devctl = musb_readb(mregs, MUSB_DEVCTL); | 153 | devctl = musb_readb(mregs, MUSB_DEVCTL); |
154 | DBG(7, "Poll devctl %02x (%s)\n", devctl, | 154 | dev_dbg(musb->controller, "Poll devctl %02x (%s)\n", devctl, |
155 | otg_state_string(musb->xceiv->state)); | 155 | otg_state_string(musb->xceiv->state)); |
156 | 156 | ||
157 | spin_lock_irqsave(&musb->lock, flags); | 157 | spin_lock_irqsave(&musb->lock, flags); |
@@ -203,7 +203,7 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout) | |||
203 | /* Never idle if active, or when VBUS timeout is not set as host */ | 203 | /* Never idle if active, or when VBUS timeout is not set as host */ |
204 | if (musb->is_active || (musb->a_wait_bcon == 0 && | 204 | if (musb->is_active || (musb->a_wait_bcon == 0 && |
205 | musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) { | 205 | musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) { |
206 | DBG(4, "%s active, deleting timer\n", | 206 | dev_dbg(musb->controller, "%s active, deleting timer\n", |
207 | otg_state_string(musb->xceiv->state)); | 207 | otg_state_string(musb->xceiv->state)); |
208 | del_timer(&otg_workaround); | 208 | del_timer(&otg_workaround); |
209 | last_timer = jiffies; | 209 | last_timer = jiffies; |
@@ -211,12 +211,12 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout) | |||
211 | } | 211 | } |
212 | 212 | ||
213 | if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) { | 213 | if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) { |
214 | DBG(4, "Longer idle timer already pending, ignoring...\n"); | 214 | dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n"); |
215 | return; | 215 | return; |
216 | } | 216 | } |
217 | last_timer = timeout; | 217 | last_timer = timeout; |
218 | 218 | ||
219 | DBG(4, "%s inactive, starting idle timer for %u ms\n", | 219 | dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n", |
220 | otg_state_string(musb->xceiv->state), | 220 | otg_state_string(musb->xceiv->state), |
221 | jiffies_to_msecs(timeout - jiffies)); | 221 | jiffies_to_msecs(timeout - jiffies)); |
222 | mod_timer(&otg_workaround, timeout); | 222 | mod_timer(&otg_workaround, timeout); |
@@ -305,7 +305,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci) | |||
305 | } | 305 | } |
306 | 306 | ||
307 | /* NOTE: this must complete power-on within 100 ms. */ | 307 | /* NOTE: this must complete power-on within 100 ms. */ |
308 | DBG(2, "VBUS %s (%s)%s, devctl %02x\n", | 308 | dev_dbg(musb->controller, "VBUS %s (%s)%s, devctl %02x\n", |
309 | drvvbus ? "on" : "off", | 309 | drvvbus ? "on" : "off", |
310 | otg_state_string(musb->xceiv->state), | 310 | otg_state_string(musb->xceiv->state), |
311 | err ? " ERROR" : "", | 311 | err ? " ERROR" : "", |