From a75e718c49f8d0b45fd5bcf1c6d79890b3dff4cb Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 19 Dec 2011 12:01:28 +0200
Subject: [PATCH] --- yaml --- r: 289600 b: refs/heads/master c:
 220e860009ff4091b75f614eb0d09a7a8486bbe6 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/usb/gadget/amd5536udc.c | 33 +++++----------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 44fb008e4824..4dc3134cbed1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade78f9feb2ee3e03460ef3730d7656c4903d999
+refs/heads/master: 220e860009ff4091b75f614eb0d09a7a8486bbe6
diff --git a/trunk/drivers/usb/gadget/amd5536udc.c b/trunk/drivers/usb/gadget/amd5536udc.c
index 1355a2f5e685..2204a4c68d85 100644
--- a/trunk/drivers/usb/gadget/amd5536udc.c
+++ b/trunk/drivers/usb/gadget/amd5536udc.c
@@ -827,20 +827,8 @@ __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;
-	}
+	if (ep->dma)
+		usb_gadget_unmap_request(&dev->gadget, &req->req, ep->in);
 
 	halted = ep->halted;
 	ep->halted = 1;
@@ -1089,20 +1077,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, usbreq, ep->in);
+		if (retval)
+			return retval;
 	}
 
 	VDBG(dev, "%s queue req %p, len %d req->td_data=%p buf %p\n",