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>

1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 7a95ab87ac00..9fbe73688037 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -107,9 +107,8 @@ static void am35x_musb_enable(struct musb *musb)
         musb_writel(reg_base, CORE_INTR_MASK_SET_REG, AM35X_INTR_USB_MASK);
 
         /* Force the DRVVBUS IRQ so we can start polling for ID change. */
-        if (is_otg_enabled(musb))
-                musb_writel(reg_base, CORE_INTR_SRC_SET_REG,
-                            AM35X_INTR_DRVVBUS << AM35X_INTR_USB_SHIFT);
+        musb_writel(reg_base, CORE_INTR_SRC_SET_REG,
+                        AM35X_INTR_DRVVBUS << AM35X_INTR_USB_SHIFT);
 }
 
 /*
@@ -173,9 +172,6 @@ static void otg_timer(unsigned long _musb)
                             MUSB_INTR_VBUSERROR << AM35X_INTR_USB_SHIFT);
                 break;
         case OTG_STATE_B_IDLE:
-                if (!is_peripheral_enabled(musb))
-                        break;
-
                 devctl = musb_readb(mregs, MUSB_DEVCTL);
                 if (devctl & MUSB_DEVCTL_BDEVICE)
                         mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
@@ -192,9 +188,6 @@ static void am35x_musb_try_idle(struct musb *musb, unsigned long timeout)
 {
         static unsigned long last_timer;
 
-        if (!is_otg_enabled(musb))
-                return;
-
         if (timeout == 0)
                 timeout = jiffies + msecs_to_jiffies(3);
 
@@ -271,8 +264,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
                 u8 devctl = musb_readb(mregs, MUSB_DEVCTL);
                 int err;
 
-                err = is_host_enabled(musb) && (musb->int_usb &
-                                                MUSB_INTR_VBUSERROR);
+                err = musb->int_usb & MUSB_INTR_VBUSERROR;
                 if (err) {
                         /*
                          * The Mentor core doesn't debounce VBUS as needed
@@ -289,7 +281,7 @@ static irqreturn_t am35x_musb_interrupt(int irq, void *hci)
                         musb->xceiv->state = OTG_STATE_A_WAIT_VFALL;
                         mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
                         WARNING("VBUS error workaround (delay coming)\n");
-                } else if (is_host_enabled(musb) && drvvbus) {
+                } else if (drvvbus) {
                         MUSB_HST_MODE(musb);
                         otg->default_a = 1;
                         musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
@@ -326,7 +318,7 @@ eoi:
         }
 
         /* Poll for ID change */
-        if (is_otg_enabled(musb) && musb->xceiv->state == OTG_STATE_B_IDLE)
+        if (musb->xceiv->state == OTG_STATE_B_IDLE)
                 mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
 
         spin_unlock_irqrestore(&musb->lock, flags);
@@ -369,8 +361,7 @@ static int am35x_musb_init(struct musb *musb)
         if (IS_ERR_OR_NULL(musb->xceiv))
                 return -ENODEV;
 
-        if (is_host_enabled(musb))
-                setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
+        setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
 
         /* Reset the musb */
         if (data->reset)
@@ -400,8 +391,7 @@ static int am35x_musb_exit(struct musb *musb)
         struct musb_hdrc_platform_data *plat = dev->platform_data;
         struct omap_musb_board_data *data = plat->board_data;
 
-        if (is_host_enabled(musb))
-                del_timer_sync(&otg_workaround);
+        del_timer_sync(&otg_workaround);
 
         /* Shutdown the on-chip PHY and its PLL. */
         if (data->set_phy_power)