From: Tony Lindgren Date: Mon, 13 Aug 2007 12:18:32 +0000 (-0700) Subject: musb_hdrc: Search and replace bTx with tx X-Git-Tag: v2.6.23-omap1~228^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c5d52007ff861aa0c9d6377c7199558d63aba956;p=linux-2.6-omap-h63xx.git musb_hdrc: Search and replace bTx with tx Search and replace bTx with tx Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/musb/g_ep0.c b/drivers/usb/musb/g_ep0.c index c20728d5a40..e1cbf18dac2 100644 --- a/drivers/usb/musb/g_ep0.c +++ b/drivers/usb/musb/g_ep0.c @@ -835,7 +835,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags) req->musb = musb; req->request.actual = 0; req->request.status = -EINPROGRESS; - req->bTx = ep->is_in; + req->tx = ep->is_in; spin_lock_irqsave(&musb->lock, lockflags); diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index a3c55fd4095..8247f5f20dc 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -123,7 +123,7 @@ __acquires(ep->musb->lock) dma_unmap_single(musb->controller, req->request.dma, req->request.length, - req->bTx + req->tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE); req->request.dma = DMA_ADDR_INVALID; @@ -132,7 +132,7 @@ __acquires(ep->musb->lock) dma_sync_single_for_cpu(musb->controller, req->request.dma, req->request.length, - req->bTx + req->tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE); } @@ -1083,11 +1083,11 @@ struct free_record { static void musb_ep_restart(struct musb *musb, struct musb_request *req) { 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); musb_ep_select(musb->mregs, req->epnum); - if (req->bTx) + if (req->tx) txstate(musb, req); else rxstate(musb, req); @@ -1122,7 +1122,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, request->request.actual = 0; request->request.status = -EINPROGRESS; 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 (request->request.dma == DMA_ADDR_INVALID) { @@ -1130,7 +1130,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, musb->controller, request->request.buf, request->request.length, - request->bTx + request->tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE); request->mapped = 1; @@ -1138,7 +1138,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, dma_sync_single_for_device(musb->controller, request->request.dma, request->request.length, - request->bTx + request->tx ? DMA_TO_DEVICE : DMA_FROM_DEVICE); request->mapped = 0; diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h index 05fa1d4d3b3..a394754941f 100644 --- a/drivers/usb/musb/musb_gadget.h +++ b/drivers/usb/musb/musb_gadget.h @@ -38,7 +38,7 @@ struct musb_request { struct usb_request request; struct musb_ep *ep; struct musb *musb; - u8 bTx; /* endpoint direction */ + u8 tx; /* endpoint direction */ u8 epnum; u8 mapped; };