summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-05-01 12:29:36 -0700
committerFelipe Balbi <balbi@ti.com>2015-05-07 13:36:27 -0500
commite530bb8f7963c2030d54974406d7d4fedc1a98d2 (patch)
treef17baa307ae8d3496de6f55feb8b74fb2691f2d8 /drivers
parentcff84bdb62f15a37ff71e0fb9c39a5e1b7a3f052 (diff)
downloadlinux-stable-e530bb8f7963c2030d54974406d7d4fedc1a98d2.tar.gz
linux-stable-e530bb8f7963c2030d54974406d7d4fedc1a98d2.tar.bz2
linux-stable-e530bb8f7963c2030d54974406d7d4fedc1a98d2.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/musb/musb_host.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 05552078a762..79826eb47ba4 100644
--- 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;