diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-11-24 15:46:26 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-08-09 12:34:46 +0300 |
| commit | 032ec49f5351e9cb242b1a1c367d14415043ab95 (patch) | |
| tree | c23887e0302e4fa10a5ee6501a85e69bbd802475 /drivers/usb/musb/omap2430.c | |
| parent | 4f3e8d263d34e52e75b5adfa14811467d3033d8e (diff) | |
| download | linux-032ec49f5351e9cb242b1a1c367d14415043ab95.tar.gz linux-032ec49f5351e9cb242b1a1c367d14415043ab95.tar.bz2 linux-032ec49f5351e9cb242b1a1c367d14415043ab95.zip | |
usb: musb: drop useless board_mode usage
we are compiling the driver always with full OTG
capabilities, so that board_mode trick becomes
useless.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/omap2430.c')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 392fc7a488f2..e32aff9920f2 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -258,7 +258,7 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue) otg->default_a = true; musb->xceiv->state = OTG_STATE_A_IDLE; musb->xceiv->last_event = USB_EVENT_ID; - if (!is_otg_enabled(musb) || musb->gadget_driver) { + if (musb->gadget_driver) { pm_runtime_get_sync(dev); usb_phy_init(musb->xceiv); omap2430_musb_set_vbus(musb, 1); @@ -281,11 +281,10 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue) dev_dbg(dev, "VBUS Disconnect\n"); musb->xceiv->last_event = USB_EVENT_NONE; - if (is_otg_enabled(musb) || is_peripheral_enabled(musb)) - if (musb->gadget_driver) { - pm_runtime_mark_last_busy(dev); - pm_runtime_put_autosuspend(dev); - } + if (musb->gadget_driver) { + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); + } if (data->interface_type == MUSB_INTERFACE_UTMI) { if (musb->xceiv->otg->set_vbus) |