... and avoid a compilation if we disable host side of musb.
Unified · Split
| @@ -379,7 +379,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, · 378 unmodified lines | ||
| 379 | 379 | u8 devctl, u8 power) |
| 380 | 380 | { |
| 381 | 381 | irqreturn_t handled = IRQ_NONE; |
| 382 | − void __iomem *mbase = musb->mregs; | |
| 383 | 382 | |
| 384 | 383 | DBG(3, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl, |
| 385 | 384 | int_usb); |
| @@ -394,6 +393,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, · 8 unmodified lines | ||
| 394 | 393 | |
| 395 | 394 | if (devctl & MUSB_DEVCTL_HM) { |
| 396 | 395 | #ifdef CONFIG_USB_MUSB_HDRC_HCD |
| 396 | + void __iomem *mbase = musb->mregs; | |
| 397 | + | |
| 397 | 398 | switch (musb->xceiv->state) { |
| 398 | 399 | case OTG_STATE_A_SUSPEND: |
| 399 | 400 | /* remote wakeup? later, GetPortStatus |
| @@ -471,6 +472,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, · 71 unmodified lines | ||
| 471 | 472 | #ifdef CONFIG_USB_MUSB_HDRC_HCD |
| 472 | 473 | /* see manual for the order of the tests */ |
| 473 | 474 | if (int_usb & MUSB_INTR_SESSREQ) { |
| 475 | + void __iomem *mbase = musb->mregs; | |
| 476 | + | |
| 474 | 477 | DBG(1, "SESSION_REQUEST (%s)\n", otg_state_string(musb)); |
| 475 | 478 | |
| 476 | 479 | /* IRQ arrives from ID pin sense or (later, if VBUS power |
| @@ -519,6 +522,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, · 42 unmodified lines | ||
| 519 | 522 | case OTG_STATE_A_WAIT_BCON: |
| 520 | 523 | case OTG_STATE_A_WAIT_VRISE: |
| 521 | 524 | if (musb->vbuserr_retry) { |
| 525 | + void __iomem *mbase = musb->mregs; | |
| 526 | + | |
| 522 | 527 | musb->vbuserr_retry--; |
| 523 | 528 | ignore = 1; |
| 524 | 529 | devctl |= MUSB_DEVCTL_SESSION; |
| @@ -622,6 +627,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, · 97 unmodified lines | ||
| 622 | 627 | |
| 623 | 628 | if (int_usb & MUSB_INTR_CONNECT) { |
| 624 | 629 | struct usb_hcd *hcd = musb_to_hcd(musb); |
| 630 | + void __iomem *mbase = musb->mregs; | |
| 625 | 631 | |
| 626 | 632 | handled = IRQ_HANDLED; |
| 627 | 633 | musb->is_active = 1; |