usb: musb: drop is_host_capable() and is_peripheral_capable()

those two were defined to 1 anyway, quite useless.

Signed-off-by: Felipe Balbi <balbi@ti.com>

2 files changed, 18 insertions, 34 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3d9b64707ba3..4bc2ad8352a7 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -791,7 +791,7 @@ b_host:
          */
         if (int_usb & MUSB_INTR_RESET) {
                 handled = IRQ_HANDLED;
-                if (is_host_capable() && (devctl & MUSB_DEVCTL_HM) != 0) {
+                if ((devctl & MUSB_DEVCTL_HM) != 0) {
                         /*
                          * Looks like non-HS BABBLE can be ignored, but
                          * HS BABBLE is an error condition. For HS the solution
@@ -805,7 +805,7 @@ b_host:
                                 ERR("Stopping host session -- babble\n");
                                 musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
                         }
-                } else if (is_peripheral_capable()) {
+                } else {
                         dev_dbg(musb->controller, "BUS RESET as %s\n",
                                 otg_state_string(musb->xceiv->state));
                         switch (musb->xceiv->state) {
@@ -1564,13 +1564,10 @@ irqreturn_t musb_interrupt(struct musb *musb)
                         /* musb_ep_select(musb->mregs, ep_num); */
                         /* REVISIT just retval = ep->rx_irq(...) */
                         retval = IRQ_HANDLED;
-                        if (devctl & MUSB_DEVCTL_HM) {
-                                if (is_host_capable())
-                                        musb_host_rx(musb, ep_num);
-                        } else {
-                                if (is_peripheral_capable())
-                                        musb_g_rx(musb, ep_num);
-                        }
+                        if (devctl & MUSB_DEVCTL_HM)
+                                musb_host_rx(musb, ep_num);
+                        else
+                                musb_g_rx(musb, ep_num);
                 }
 
                 reg >>= 1;
@@ -1585,13 +1582,10 @@ irqreturn_t musb_interrupt(struct musb *musb)
                         /* musb_ep_select(musb->mregs, ep_num); */
                         /* REVISIT just retval |= ep->tx_irq(...) */
                         retval = IRQ_HANDLED;
-                        if (devctl & MUSB_DEVCTL_HM) {
-                                if (is_host_capable())
-                                        musb_host_tx(musb, ep_num);
-                        } else {
-                                if (is_peripheral_capable())
-                                        musb_g_tx(musb, ep_num);
-                        }
+                        if (devctl & MUSB_DEVCTL_HM)
+                                musb_host_tx(musb, ep_num);
+                        else
+                                musb_g_tx(musb, ep_num);
                 }
                 reg >>= 1;
                 ep_num++;
@@ -1627,22 +1621,16 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit)
         } else {
                 /* endpoints 1..15 */
                 if (transmit) {
-                        if (devctl & MUSB_DEVCTL_HM) {
-                                if (is_host_capable())
-                                        musb_host_tx(musb, epnum);
-                        } else {
-                                if (is_peripheral_capable())
-                                        musb_g_tx(musb, epnum);
-                        }
+                        if (devctl & MUSB_DEVCTL_HM)
+                                musb_host_tx(musb, epnum);
+                        else
+                                musb_g_tx(musb, epnum);
                 } else {
                         /* receive */
-                        if (devctl & MUSB_DEVCTL_HM) {
-                                if (is_host_capable())
-                                        musb_host_rx(musb, epnum);
-                        } else {
-                                if (is_peripheral_capable())
-                                        musb_g_rx(musb, epnum);
-                        }
+                        if (devctl & MUSB_DEVCTL_HM)
+                                musb_host_rx(musb, epnum);
+                        else
+                                musb_g_rx(musb, epnum);
                 }
         }
 }
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 5dab2daddf7f..a1a32c6601c7 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -84,8 +84,6 @@ struct musb_ep;
 
 /****************************** PERIPHERAL ROLE *****************************/
 
-#define is_peripheral_capable() (1)
-
 extern irqreturn_t musb_g_ep0_irq(struct musb *);
 extern void musb_g_tx(struct musb *, u8);
 extern void musb_g_rx(struct musb *, u8);
@@ -97,8 +95,6 @@ extern void musb_g_disconnect(struct musb *);
 
 /****************************** HOST ROLE ***********************************/
 
-#define is_host_capable()       (1)
-
 extern irqreturn_t musb_h_ep0_irq(struct musb *);
 extern void musb_host_tx(struct musb *, u8);
 extern void musb_host_rx(struct musb *, u8);