diff options
Diffstat (limited to 'drivers/usb/musb/da8xx.c')
| -rw-r--r-- | drivers/usb/musb/da8xx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 0d8984993a3..662ed34980b 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c | |||
| @@ -199,7 +199,7 @@ static void otg_timer(unsigned long _musb) | |||
| 199 | * status change events (from the transceiver) otherwise. | 199 | * status change events (from the transceiver) otherwise. |
| 200 | */ | 200 | */ |
| 201 | devctl = musb_readb(mregs, MUSB_DEVCTL); | 201 | devctl = musb_readb(mregs, MUSB_DEVCTL); |
| 202 | DBG(7, "Poll devctl %02x (%s)\n", devctl, | 202 | dev_dbg(musb->controller, "Poll devctl %02x (%s)\n", devctl, |
| 203 | otg_state_string(musb->xceiv->state)); | 203 | otg_state_string(musb->xceiv->state)); |
| 204 | 204 | ||
| 205 | spin_lock_irqsave(&musb->lock, flags); | 205 | spin_lock_irqsave(&musb->lock, flags); |
| @@ -274,7 +274,7 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout) | |||
| 274 | /* Never idle if active, or when VBUS timeout is not set as host */ | 274 | /* Never idle if active, or when VBUS timeout is not set as host */ |
| 275 | if (musb->is_active || (musb->a_wait_bcon == 0 && | 275 | if (musb->is_active || (musb->a_wait_bcon == 0 && |
| 276 | musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) { | 276 | musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) { |
| 277 | DBG(4, "%s active, deleting timer\n", | 277 | dev_dbg(musb->controller, "%s active, deleting timer\n", |
| 278 | otg_state_string(musb->xceiv->state)); | 278 | otg_state_string(musb->xceiv->state)); |
| 279 | del_timer(&otg_workaround); | 279 | del_timer(&otg_workaround); |
| 280 | last_timer = jiffies; | 280 | last_timer = jiffies; |
| @@ -282,12 +282,12 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout) | |||
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) { | 284 | if (time_after(last_timer, timeout) && timer_pending(&otg_workaround)) { |
| 285 | DBG(4, "Longer idle timer already pending, ignoring...\n"); | 285 | dev_dbg(musb->controller, "Longer idle timer already pending, ignoring...\n"); |
| 286 | return; | 286 | return; |
| 287 | } | 287 | } |
| 288 | last_timer = timeout; | 288 | last_timer = timeout; |
| 289 | 289 | ||
| 290 | DBG(4, "%s inactive, starting idle timer for %u ms\n", | 290 | dev_dbg(musb->controller, "%s inactive, starting idle timer for %u ms\n", |
| 291 | otg_state_string(musb->xceiv->state), | 291 | otg_state_string(musb->xceiv->state), |
| 292 | jiffies_to_msecs(timeout - jiffies)); | 292 | jiffies_to_msecs(timeout - jiffies)); |
| 293 | mod_timer(&otg_workaround, timeout); | 293 | mod_timer(&otg_workaround, timeout); |
| @@ -314,7 +314,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) | |||
| 314 | goto eoi; | 314 | goto eoi; |
| 315 | 315 | ||
| 316 | musb_writel(reg_base, DA8XX_USB_INTR_SRC_CLEAR_REG, status); | 316 | musb_writel(reg_base, DA8XX_USB_INTR_SRC_CLEAR_REG, status); |
| 317 | DBG(4, "USB IRQ %08x\n", status); | 317 | dev_dbg(musb->controller, "USB IRQ %08x\n", status); |
| 318 | 318 | ||
| 319 | musb->int_rx = (status & DA8XX_INTR_RX_MASK) >> DA8XX_INTR_RX_SHIFT; | 319 | musb->int_rx = (status & DA8XX_INTR_RX_MASK) >> DA8XX_INTR_RX_SHIFT; |
| 320 | musb->int_tx = (status & DA8XX_INTR_TX_MASK) >> DA8XX_INTR_TX_SHIFT; | 320 | musb->int_tx = (status & DA8XX_INTR_TX_MASK) >> DA8XX_INTR_TX_SHIFT; |
| @@ -366,7 +366,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) | |||
| 366 | portstate(musb->port1_status &= ~USB_PORT_STAT_POWER); | 366 | portstate(musb->port1_status &= ~USB_PORT_STAT_POWER); |
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | DBG(2, "VBUS %s (%s)%s, devctl %02x\n", | 369 | dev_dbg(musb->controller, "VBUS %s (%s)%s, devctl %02x\n", |
| 370 | drvvbus ? "on" : "off", | 370 | drvvbus ? "on" : "off", |
| 371 | otg_state_string(musb->xceiv->state), | 371 | otg_state_string(musb->xceiv->state), |
| 372 | err ? " ERROR" : "", | 372 | err ? " ERROR" : "", |
| @@ -413,7 +413,7 @@ static int da8xx_musb_set_mode(struct musb *musb, u8 musb_mode) | |||
| 413 | break; | 413 | break; |
| 414 | #endif | 414 | #endif |
| 415 | default: | 415 | default: |
| 416 | DBG(2, "Trying to set unsupported mode %u\n", musb_mode); | 416 | dev_dbg(musb->controller, "Trying to set unsupported mode %u\n", musb_mode); |
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | __raw_writel(cfgchip2, CFGCHIP2); | 419 | __raw_writel(cfgchip2, CFGCHIP2); |
