diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-12-19 12:07:40 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-02-28 14:49:09 +0200 |
| commit | af93f2c77ac79e2f0bed542b5890f618d9d0cdb3 (patch) | |
| tree | f6a5672ee968529dc65283c7d576656d628b652d /drivers/usb/gadget/net2272.c | |
| parent | 05d00fbe87f185d55edf7461d4f714a3909bc908 (diff) | |
| download | op-kernel-dev-af93f2c77ac79e2f0bed542b5890f618d9d0cdb3.zip op-kernel-dev-af93f2c77ac79e2f0bed542b5890f618d9d0cdb3.tar.gz | |
usb: gadget: net2272: use generic map/umap routines
those routines have everything we need to map/unmap
USB requests and it's better to use them.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/net2272.c')
| -rw-r--r-- | drivers/usb/gadget/net2272.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c index 7322d29..01ae56f 100644 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@ -385,12 +385,9 @@ net2272_done(struct net2272_ep *ep, struct net2272_request *req, int status) status = req->req.status; dev = ep->dev; - if (use_dma && req->mapped) { - dma_unmap_single(dev->dev, req->req.dma, req->req.length, - ep->is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE); - req->req.dma = DMA_ADDR_INVALID; - req->mapped = 0; - } + if (use_dma && ep->dma) + usb_gadget_unmap_request(&dev->gadget, &req->req, + ep->is_in); if (status && status != -ESHUTDOWN) dev_vdbg(dev->dev, "complete %s req %p stat %d len %u/%u buf %p\n", @@ -850,10 +847,11 @@ net2272_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) return -ESHUTDOWN; /* set up dma mapping in case the caller didn't */ - if (use_dma && ep->dma && _req->dma == DMA_ADDR_INVALID) { - _req->dma = dma_map_single(dev->dev, _req->buf, _req->length, - ep->is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE); - req->mapped = 1; + if (use_dma && ep->dma) { + status = usb_gadget_map_request(&dev->gadget, _req, + ep->is_in); + if (status) + return status; } dev_vdbg(dev->dev, "%s queue req %p, len %d buf %p dma %08llx %s\n", |
