diff options
author | Felipe Balbi <balbi@ti.com> | 2011-12-19 12:09:56 +0200 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-02-28 14:49:11 +0200 |
commit | ae4d7933344e8bc5702cdc56e9498d3852cf3b2a (patch) | |
tree | e30b70bd138d59f808d988243fe6d19958637576 /drivers/usb/gadget/net2280.c | |
parent | af93f2c77ac79e2f0bed542b5890f618d9d0cdb3 (diff) | |
download | op-kernel-dev-ae4d7933344e8bc5702cdc56e9498d3852cf3b2a.zip op-kernel-dev-ae4d7933344e8bc5702cdc56e9498d3852cf3b2a.tar.gz |
usb: gadget: net2280: use generic map/unmap 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/net2280.c')
-rw-r--r-- | drivers/usb/gadget/net2280.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index cdedd13..a5ccabc 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@ -806,12 +806,8 @@ done (struct net2280_ep *ep, struct net2280_request *req, int status) status = req->req.status; dev = ep->dev; - if (req->mapped) { - pci_unmap_single (dev->pdev, req->req.dma, req->req.length, - ep->is_in ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); - req->req.dma = DMA_ADDR_INVALID; - req->mapped = 0; - } + if (ep->dma) + usb_gadget_unmap_request(&dev->gadget, &req->req, ep->is_in); if (status && status != -ESHUTDOWN) VDEBUG (dev, "complete %s req %p stat %d len %u/%u\n", @@ -857,10 +853,13 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) return -EOPNOTSUPP; /* set up dma mapping in case the caller didn't */ - if (ep->dma && _req->dma == DMA_ADDR_INVALID) { - _req->dma = pci_map_single (dev->pdev, _req->buf, _req->length, - ep->is_in ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); - req->mapped = 1; + if (ep->dma) { + int ret; + + ret = usb_gadget_map_request(&dev->gadget, _req, + ep->is_in); + if (ret) + return ret; } #if 0 |