Commit c5d52007 authored by Tony Lindgren's avatar Tony Lindgren

musb_hdrc: Search and replace bTx with tx

Search and replace bTx with tx
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 5b9799c8
...@@ -835,7 +835,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags) ...@@ -835,7 +835,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
req->musb = musb; req->musb = musb;
req->request.actual = 0; req->request.actual = 0;
req->request.status = -EINPROGRESS; req->request.status = -EINPROGRESS;
req->bTx = ep->is_in; req->tx = ep->is_in;
spin_lock_irqsave(&musb->lock, lockflags); spin_lock_irqsave(&musb->lock, lockflags);
......
...@@ -123,7 +123,7 @@ __acquires(ep->musb->lock) ...@@ -123,7 +123,7 @@ __acquires(ep->musb->lock)
dma_unmap_single(musb->controller, dma_unmap_single(musb->controller,
req->request.dma, req->request.dma,
req->request.length, req->request.length,
req->bTx req->tx
? DMA_TO_DEVICE ? DMA_TO_DEVICE
: DMA_FROM_DEVICE); : DMA_FROM_DEVICE);
req->request.dma = DMA_ADDR_INVALID; req->request.dma = DMA_ADDR_INVALID;
...@@ -132,7 +132,7 @@ __acquires(ep->musb->lock) ...@@ -132,7 +132,7 @@ __acquires(ep->musb->lock)
dma_sync_single_for_cpu(musb->controller, dma_sync_single_for_cpu(musb->controller,
req->request.dma, req->request.dma,
req->request.length, req->request.length,
req->bTx req->tx
? DMA_TO_DEVICE ? DMA_TO_DEVICE
: DMA_FROM_DEVICE); : DMA_FROM_DEVICE);
} }
...@@ -1083,11 +1083,11 @@ struct free_record { ...@@ -1083,11 +1083,11 @@ struct free_record {
static void musb_ep_restart(struct musb *musb, struct musb_request *req) static void musb_ep_restart(struct musb *musb, struct musb_request *req)
{ {
DBG(3, "<== %s request %p len %u on hw_ep%d\n", DBG(3, "<== %s request %p len %u on hw_ep%d\n",
req->bTx ? "TX/IN" : "RX/OUT", req->tx ? "TX/IN" : "RX/OUT",
&req->request, req->request.length, req->epnum); &req->request, req->request.length, req->epnum);
musb_ep_select(musb->mregs, req->epnum); musb_ep_select(musb->mregs, req->epnum);
if (req->bTx) if (req->tx)
txstate(musb, req); txstate(musb, req);
else else
rxstate(musb, req); rxstate(musb, req);
...@@ -1122,7 +1122,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -1122,7 +1122,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
request->request.actual = 0; request->request.actual = 0;
request->request.status = -EINPROGRESS; request->request.status = -EINPROGRESS;
request->epnum = musb_ep->current_epnum; request->epnum = musb_ep->current_epnum;
request->bTx = musb_ep->is_in; request->tx = musb_ep->is_in;
if (is_dma_capable() && musb_ep->dma) { if (is_dma_capable() && musb_ep->dma) {
if (request->request.dma == DMA_ADDR_INVALID) { if (request->request.dma == DMA_ADDR_INVALID) {
...@@ -1130,7 +1130,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -1130,7 +1130,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
musb->controller, musb->controller,
request->request.buf, request->request.buf,
request->request.length, request->request.length,
request->bTx request->tx
? DMA_TO_DEVICE ? DMA_TO_DEVICE
: DMA_FROM_DEVICE); : DMA_FROM_DEVICE);
request->mapped = 1; request->mapped = 1;
...@@ -1138,7 +1138,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, ...@@ -1138,7 +1138,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
dma_sync_single_for_device(musb->controller, dma_sync_single_for_device(musb->controller,
request->request.dma, request->request.dma,
request->request.length, request->request.length,
request->bTx request->tx
? DMA_TO_DEVICE ? DMA_TO_DEVICE
: DMA_FROM_DEVICE); : DMA_FROM_DEVICE);
request->mapped = 0; request->mapped = 0;
......
...@@ -38,7 +38,7 @@ struct musb_request { ...@@ -38,7 +38,7 @@ struct musb_request {
struct usb_request request; struct usb_request request;
struct musb_ep *ep; struct musb_ep *ep;
struct musb *musb; struct musb *musb;
u8 bTx; /* endpoint direction */ u8 tx; /* endpoint direction */
u8 epnum; u8 epnum;
u8 mapped; u8 mapped;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment