Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac8a138c authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: gadget: langwell: use generic map/unmap functions 



those routines have everything we need to map/unmap
USB requests and it's better to use them.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0fc9a1be

drivers/usb/gadget/langwell_udc.c

+7 −38
Original line number Diff line number Diff line
@@ -406,16 +406,7 @@ static void done(struct langwell_ep *ep, struct langwell_request *req, 
		dma_pool_free(dev->dtd_pool, curr_dtd, curr_dtd->dtd_dma);

	}



	if (req->mapped) {

		dma_unmap_single(&dev->pdev->dev,

			req->req.dma, req->req.length,

			is_in(ep) ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);

		req->req.dma = DMA_ADDR_INVALID;

		req->mapped = 0;

	} else

		dma_sync_single_for_cpu(&dev->pdev->dev, req->req.dma,

				req->req.length,

				is_in(ep) ? DMA_TO_DEVICE : DMA_FROM_DEVICE);

	usb_gadget_unmap_request(&dev->gadget, &req->req, is_in(ep));



	if (status != -ESHUTDOWN)

		dev_dbg(&dev->pdev->dev,
@@ -755,7 +746,8 @@ static int langwell_ep_queue(struct usb_ep *_ep, struct usb_request *_req, 
	struct langwell_ep	*ep;

	struct langwell_udc	*dev;

	unsigned long		flags;

	int			is_iso = 0, zlflag = 0;

	int			is_iso = 0;

	int			ret;



	/* always require a cpu-view buffer */

	req = container_of(_req, struct langwell_request, req);
@@ -782,33 +774,10 @@ static int langwell_ep_queue(struct usb_ep *_ep, struct usb_request *_req, 
	if (unlikely(!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN))

		return -ESHUTDOWN;



	/* set up dma mapping in case the caller didn't */

	if (_req->dma == DMA_ADDR_INVALID) {

		/* WORKAROUND: WARN_ON(size == 0) */

		if (_req->length == 0) {

			dev_vdbg(&dev->pdev->dev, "req->length: 0->1\n");

			zlflag = 1;

			_req->length++;

		}



		_req->dma = dma_map_single(&dev->pdev->dev,

				_req->buf, _req->length,

				is_in(ep) ? DMA_TO_DEVICE : DMA_FROM_DEVICE);

		if (zlflag && (_req->length == 1)) {

			dev_vdbg(&dev->pdev->dev, "req->length: 1->0\n");

			zlflag = 0;

			_req->length = 0;

		}



		req->mapped = 1;

		dev_vdbg(&dev->pdev->dev, "req->mapped = 1\n");

	} else {

		dma_sync_single_for_device(&dev->pdev->dev,

				_req->dma, _req->length,

				is_in(ep) ?  DMA_TO_DEVICE : DMA_FROM_DEVICE);

		req->mapped = 0;

		dev_vdbg(&dev->pdev->dev, "req->mapped = 0\n");

	}

	/* set up dma mapping */

	ret = usb_gadget_map_request(&dev->gadget, &req->req, is_in(ep));

	if (ret)

		return ret;



	dev_dbg(&dev->pdev->dev,

			"%s queue req %p, len %u, buf %p, dma 0x%08x\n",