iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tony Lindgren 2015-05-01 12:29:34 -07:00 committed by Felipe Balbi
parent 069a3fd19a
commit 557d543e3f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/musb/musb_host.c
View File

@ -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 */ /* FIXME this is _way_ too much in-line logic for Mentor DMA */
if (!musb_dma_inventra(musb) && !musb_dma_ux500(musb) &&
#if !defined(CONFIG_USB_INVENTRA_DMA) && !defined(CONFIG_USB_UX500_DMA) (rx_csr & MUSB_RXCSR_H_REQPKT)) {
if (rx_csr & MUSB_RXCSR_H_REQPKT) {
/* REVISIT this happened for a while on some short reads... /* REVISIT this happened for a while on some short reads...
* the cleanup still needs investigation... looks bad... * the cleanup still needs investigation... looks bad...
* and also duplicates dma cleanup code above ... plus, * 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_writew(epio, MUSB_RXCSR,
MUSB_RXCSR_H_WZC_BITS | rx_csr); MUSB_RXCSR_H_WZC_BITS | rx_csr);
} }
#endif
if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) { if (dma && (rx_csr & MUSB_RXCSR_DMAENAB)) {
xfer_len = dma->actual_len; xfer_len = dma->actual_len;