Commit 0244336f authored by Felipe Balbi's avatar Felipe Balbi

usb: musb: core: disable irqs inside babble recovery

There's no point is splitting those anymore.

We're now also able to drop another forward
declaration.
Tested-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 06753fe1
...@@ -507,7 +507,6 @@ void musb_hnp_stop(struct musb *musb) ...@@ -507,7 +507,6 @@ void musb_hnp_stop(struct musb *musb)
musb->port1_status &= ~(USB_PORT_STAT_C_CONNECTION << 16); musb->port1_status &= ~(USB_PORT_STAT_C_CONNECTION << 16);
} }
static void musb_disable_interrupts(struct musb *musb);
static void musb_recover_from_babble(struct musb *musb); static void musb_recover_from_babble(struct musb *musb);
/* /*
...@@ -883,11 +882,9 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, ...@@ -883,11 +882,9 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
if (power & MUSB_POWER_HSMODE) { if (power & MUSB_POWER_HSMODE) {
dev_err(musb->controller, "Babble\n"); dev_err(musb->controller, "Babble\n");
if (is_host_active(musb)) { if (is_host_active(musb))
musb_disable_interrupts(musb);
musb_recover_from_babble(musb); musb_recover_from_babble(musb);
} }
}
} else { } else {
dev_dbg(musb->controller, "BUS RESET as %s\n", dev_dbg(musb->controller, "BUS RESET as %s\n",
usb_otg_state_string(musb->xceiv->otg->state)); usb_otg_state_string(musb->xceiv->otg->state));
...@@ -1835,6 +1832,8 @@ static void musb_recover_from_babble(struct musb *musb) ...@@ -1835,6 +1832,8 @@ static void musb_recover_from_babble(struct musb *musb)
int ret; int ret;
u8 devctl; u8 devctl;
musb_disable_interrupts(musb);
/* /*
* wait at least 320 cycles of 60MHz clock. That's 5.3us, we will give * wait at least 320 cycles of 60MHz clock. That's 5.3us, we will give
* it some slack and wait for 10us. * it some slack and wait for 10us.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment