Commit 4c0c6d00 authored by Felipe Balbi's avatar Felipe Balbi

usb: gadget: mv_udc_core: switch over to usb_gadget_map/unmap_request()

we have generic implementations for a reason,
let's use them
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 369ac9cb
...@@ -237,18 +237,7 @@ static void done(struct mv_ep *ep, struct mv_req *req, int status) ...@@ -237,18 +237,7 @@ static void done(struct mv_ep *ep, struct mv_req *req, int status)
dma_pool_free(udc->dtd_pool, curr_td, curr_td->td_dma); dma_pool_free(udc->dtd_pool, curr_td, curr_td->td_dma);
} }
if (req->mapped) { usb_gadget_unmap_request(&udc->gadget, &req->req, ep_dir(ep));
dma_unmap_single(ep->udc->gadget.dev.parent,
req->req.dma, req->req.length,
((ep_dir(ep) == EP_DIR_IN) ?
DMA_TO_DEVICE : DMA_FROM_DEVICE));
req->req.dma = DMA_ADDR_INVALID;
req->mapped = 0;
} else
dma_sync_single_for_cpu(ep->udc->gadget.dev.parent,
req->req.dma, req->req.length,
((ep_dir(ep) == EP_DIR_IN) ?
DMA_TO_DEVICE : DMA_FROM_DEVICE));
if (status && (status != -ESHUTDOWN)) if (status && (status != -ESHUTDOWN))
dev_info(&udc->dev->dev, "complete %s req %p stat %d len %u/%u", dev_info(&udc->dev->dev, "complete %s req %p stat %d len %u/%u",
...@@ -732,21 +721,9 @@ mv_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) ...@@ -732,21 +721,9 @@ mv_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
req->ep = ep; req->ep = ep;
/* map virtual address to hardware */ /* map virtual address to hardware */
if (req->req.dma == DMA_ADDR_INVALID) { retval = usb_gadget_map_request(&udc->gadget, _req, ep_dir(ep));
req->req.dma = dma_map_single(ep->udc->gadget.dev.parent, if (retval)
req->req.buf, return retval;
req->req.length, ep_dir(ep)
? DMA_TO_DEVICE
: DMA_FROM_DEVICE);
req->mapped = 1;
} else {
dma_sync_single_for_device(ep->udc->gadget.dev.parent,
req->req.dma, req->req.length,
ep_dir(ep)
? DMA_TO_DEVICE
: DMA_FROM_DEVICE);
req->mapped = 0;
}
req->req.status = -EINPROGRESS; req->req.status = -EINPROGRESS;
req->req.actual = 0; req->req.actual = 0;
...@@ -780,18 +757,7 @@ mv_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) ...@@ -780,18 +757,7 @@ mv_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
return 0; return 0;
err_unmap_dma: err_unmap_dma:
if (req->mapped) { usb_gadget_unmap_request(&udc->gadget, _req, ep_dir(ep));
dma_unmap_single(ep->udc->gadget.dev.parent,
req->req.dma, req->req.length,
((ep_dir(ep) == EP_DIR_IN) ?
DMA_TO_DEVICE : DMA_FROM_DEVICE));
req->req.dma = DMA_ADDR_INVALID;
req->mapped = 0;
} else
dma_sync_single_for_cpu(ep->udc->gadget.dev.parent,
req->req.dma, req->req.length,
((ep_dir(ep) == EP_DIR_IN) ?
DMA_TO_DEVICE : DMA_FROM_DEVICE));
return retval; return retval;
} }
...@@ -1528,14 +1494,7 @@ udc_prime_status(struct mv_udc *udc, u8 direction, u16 status, bool empty) ...@@ -1528,14 +1494,7 @@ udc_prime_status(struct mv_udc *udc, u8 direction, u16 status, bool empty)
return 0; return 0;
out: out:
if (req->mapped) { usb_gadget_unmap_request(&udc->gadget, &req->req, ep_dir(ep));
dma_unmap_single(ep->udc->gadget.dev.parent,
req->req.dma, req->req.length,
((ep_dir(ep) == EP_DIR_IN) ?
DMA_TO_DEVICE : DMA_FROM_DEVICE));
req->req.dma = DMA_ADDR_INVALID;
req->mapped = 0;
}
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment