usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part4

Remove ifdefs for musb_host_rx to get closer to building in
all the DMA drivers.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 05552078a7620501ab141d33098a045648d08fe1..79826eb47ba4467533e9ec0ac95bc451923a3fb2 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1857,9 +1857,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                }
 
                /* we are expecting IN packets */
-#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_UX500_DMA) || \
-       defined(CONFIG_USB_TI_CPPI41_DMA)
-               if (dma) {
+               if ((musb_dma_inventra(musb) || musb_dma_ux500(musb) ||
+                   musb_dma_cppi41(musb)) && dma) {
                        struct dma_controller   *c;
                        u16                     rx_count;
                        int                     ret, length;
@@ -1976,7 +1975,6 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                                musb_writew(epio, MUSB_RXCSR, val);
                        }
                }
-#endif /* Mentor DMA */
 
                if (!dma) {
                        unsigned int received_len;