lkml.org 
[lkml]   [2011]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/9] usb: gadget: net2280: use generic map/unmap routines
    Date
    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>
    ---
    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 cf1f364..59d4794 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 (req->mapped)
    + 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->req,
    + ep->is_in);
    + if (ret)
    + return ret;
    }

    #if 0
    --
    1.7.8.rc3


    \
     
     \ /
      Last update: 2011-12-19 11:33    [W:0.019 / U:150.832 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site