summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-05-01 12:29:34 -0700
committerFelipe Balbi <balbi@ti.com>2015-05-07 13:36:17 -0500
commit557d543e3f18acf4aa3b9e1860ef38e106696673 (patch)
treea2850a3a766310763c4ccbf9ea95c6d4d8bc1c7b /drivers/usb/musb
parent069a3fd19aa4108ee24dd8a3c3e4ef393b9f99ef (diff)
downloadop-kernel-dev-557d543e3f18acf4aa3b9e1860ef38e106696673.zip
op-kernel-dev-557d543e3f18acf4aa3b9e1860ef38e106696673.tar.gz
usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part2
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/usb/musb')
-rw-r--r--drivers/usb/musb/musb_host.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index bf725f0..6f23563 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1734,9 +1734,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
*/
/* FIXME this is _way_ too much in-line logic for Mentor DMA */
-
-#if !defined(CONFIG_USB_INVENTRA_DMA) && !defined(CONFIG_USB_UX500_DMA)
- if (rx_csr & MUSB_RXCSR_H_REQPKT) {
+ if (!musb_dma_inventra(musb) && !musb_dma_ux500(musb) &&
+ (rx_csr & MUSB_RXCSR_H_REQPKT)) {
/* REVISIT this happened for a while on some short reads...
* the cleanup still needs investigation... looks bad...
* and also duplicates dma cleanup code above ... plus,
@@ -1757,7 +1756,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
musb_writew(epio, MUSB_RXCSR,
MUSB_RXCSR_H_WZC_BITS | rx_csr);
}
-#endif
+
if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) {
xfer_len = dma->actual_len;
OpenPOWER on IntegriCloud