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

tmlind · Felipe Balbi · commit e530bb8f7963 · 2015-05-07T13:36:27.000-05:00
Remove ifdefs for musb_host_rx to get closer to building in
all the DMA drivers.

Signed-off-by: Tony Lindgren &lt;tony@atomide.com&gt;
Signed-off-by: Felipe Balbi &lt;balbi@ti.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -1857,9 +1857,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)`
`1857`	`1857`	`}`
`1858`	`1858`
`1859`	`1859`	`/* we are expecting IN packets */`
`1860`		`-#if defined(CONFIG_USB_INVENTRA_DMA) \|\| defined(CONFIG_USB_UX500_DMA) \|\| \`
`1861`		`- defined(CONFIG_USB_TI_CPPI41_DMA)`
`1862`		`- if (dma) {`
	`1860`	`+ if ((musb_dma_inventra(musb) \|\| musb_dma_ux500(musb) \|\|`
	`1861`	`+ musb_dma_cppi41(musb)) && dma) {`
`1863`	`1862`	`struct dma_controller *c;`
`1864`	`1863`	`u16 rx_count;`
`1865`	`1864`	`int ret, length;`
`@@ -1976,7 +1975,6 @@ void musb_host_rx(struct musb *musb, u8 epnum)`
`1976`	`1975`	`musb_writew(epio, MUSB_RXCSR, val);`
`1977`	`1976`	`}`
`1978`	`1977`	`}`
`1979`		`-#endif /* Mentor DMA */`
`1980`	`1978`
`1981`	`1979`	`if (!dma) {`
`1982`	`1980`	`unsigned int received_len;`