From: Ming Lei <tom.leiming@xxxxxxxxx>
This comments has said clearly that they are for Mentor(INVENTRA) DMA
controller, so remove this unnecessary ifdef to make code more clean.
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
---
drivers/usb/musb/musb_gadget.c | 8 --------
drivers/usb/musb/musb_host.c | 8 --------
2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 67de3b7..da8db20 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -253,8 +253,6 @@ static inline int max_ep_writesize(struct musb *musb, struct musb_ep *ep)
}
-#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Peripheral tx (IN) using Mentor DMA works as follows:
Only mode 0 is used for transfers <= wPktSize,
mode 1 is used for larger transfers,
@@ -285,8 +283,6 @@ static inline int max_ep_writesize(struct musb *musb, struct musb_ep *ep)
* upleveling from irq-per-packet to irq-per-buffer.
*/
-#endif
-
/*
* An endpoint is transmitting data. This can be called either from
* the IRQ routine or from ep.queue() to kickstart a request on an
@@ -563,8 +559,6 @@ void musb_g_tx(struct musb *musb, u8 epnum)
/* ------------------------------------------------------------ */
-#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Peripheral rx (OUT) using Mentor DMA works as follows:
- Only mode 0 is used.
@@ -592,8 +586,6 @@ void musb_g_tx(struct musb *musb, u8 epnum)
* Non-Mentor DMA engines can of course work differently.
*/
-#endif
-
/*
* Context: controller locked, IRQs blocked, endpoint selected
*/
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index a2c6bdb..8aa77ea 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1089,8 +1089,6 @@ done:
}
-#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Host side TX (OUT) using Mentor DMA works as follows:
submit_urb ->
- if queue was empty, Program Endpoint
@@ -1103,8 +1101,6 @@ done:
short packets in mode 1.
*/
-#endif
-
/* Service a Tx-Available or dma completion irq for the endpoint */
void musb_host_tx(struct musb *musb, u8 epnum)
{
@@ -1346,8 +1342,6 @@ void musb_host_tx(struct musb *musb, u8 epnum)
}
-#ifdef CONFIG_USB_INVENTRA_DMA
-
/* Host side RX (IN) using Mentor DMA works as follows:
submit_urb ->
- if queue was empty, ProgramEndpoint
@@ -1383,8 +1377,6 @@ void musb_host_tx(struct musb *musb, u8 epnum)
* last packet of one URB's transfer.
*/
-#endif
-
/* Schedule next QH from musb->in_bulk and move the current qh to
* the end; avoids starvation for other endpoints.
*/
--
1.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
