Skip to content

Commit

Permalink
usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part4
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Lindgren authored and Felipe Balbi committed May 7, 2015
1 parent cff84bd commit e530bb8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/usb/musb/musb_host.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e530bb8

Please sign in to comment.