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 5/9] usb: gadget: amd5536: 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/amd5536udc.c | 32 +++++---------------------------
    1 files changed, 5 insertions(+), 27 deletions(-)

    diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
    index e9a2c5c..d3d0282 100644
    --- a/drivers/usb/gadget/amd5536udc.c
    +++ b/drivers/usb/gadget/amd5536udc.c
    @@ -831,20 +831,7 @@ __acquires(ep->dev->lock)

    dev = ep->dev;
    /* unmap DMA */
    - if (req->dma_mapping) {
    - if (ep->in)
    - pci_unmap_single(dev->pdev,
    - req->req.dma,
    - req->req.length,
    - PCI_DMA_TODEVICE);
    - else
    - pci_unmap_single(dev->pdev,
    - req->req.dma,
    - req->req.length,
    - PCI_DMA_FROMDEVICE);
    - req->dma_mapping = 0;
    - req->req.dma = DMA_DONT_USE;
    - }
    + usb_gadget_unmap_request(&dev->gadget, &req->req, ep->in);

    halted = ep->halted;
    ep->halted = 1;
    @@ -1095,20 +1082,11 @@ udc_queue(struct usb_ep *usbep, struct usb_request *usbreq, gfp_t gfp)
    return -ESHUTDOWN;

    /* map dma (usually done before) */
    - if (ep->dma && usbreq->length != 0
    - && (usbreq->dma == DMA_DONT_USE || usbreq->dma == 0)) {
    + if (ep->dma) {
    VDBG(dev, "DMA map req %p\n", req);
    - if (ep->in)
    - usbreq->dma = pci_map_single(dev->pdev,
    - usbreq->buf,
    - usbreq->length,
    - PCI_DMA_TODEVICE);
    - else
    - usbreq->dma = pci_map_single(dev->pdev,
    - usbreq->buf,
    - usbreq->length,
    - PCI_DMA_FROMDEVICE);
    - req->dma_mapping = 1;
    + retval = usb_gadget_map_request(&udc->gadget, &req->req, ep->in);
    + if (retval)
    + return retval;
    }

    VDBG(dev, "%s queue req %p, len %d req->td_data=%p buf %p\n",
    --
    1.7.8.rc3


    \
     
     \ /
      Last update: 2011-12-19 11:33    [W:2.296 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site