From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756227Ab2AXLsJ (ORCPT ); Tue, 24 Jan 2012 06:48:09 -0500 Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:39435 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756052Ab2AXLsG (ORCPT ); Tue, 24 Jan 2012 06:48:06 -0500 MIME-Version: 1.0 From: Felipe Balbi To: Linux USB Mailing List Cc: Felipe Balbi , Greg Kroah-Hartman (supporter:USB SUBSYSTEM ,commit_signer:28/51=55%), Thomas Dahlmann (supporter:AMD GEODE CS5536...), Kuninori Morimoto (commit_signer:43/51=84%), linux-omap@vger.kernel.org (open list:DESIGNWARE USB3 D...), linux-kernel@vger.kernel.org (open list), linux-geode@lists.infradead.org (open list:AMD GEODE CS5536...) Subject: [PATCH 7/9] usb: gadget: net2272: use generic map/umap routines Date: Tue, 24 Jan 2012 13:45:28 +0200 Message-Id: <1327405543-27589-8-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.8.2 In-Reply-To: <1327405543-27589-1-git-send-email-balbi@ti.com> References: <1327405543-27589-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org those routines have everything we need to map/unmap USB requests and it's better to use them. Signed-off-by: Felipe Balbi --- drivers/usb/gadget/net2272.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c index 7322d29..01ae56f 100644 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@ -385,12 +385,9 @@ net2272_done(struct net2272_ep *ep, struct net2272_request *req, int status) status = req->req.status; dev = ep->dev; - if (use_dma && req->mapped) { - dma_unmap_single(dev->dev, req->req.dma, req->req.length, - ep->is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE); - req->req.dma = DMA_ADDR_INVALID; - req->mapped = 0; - } + if (use_dma && ep->dma) + usb_gadget_unmap_request(&dev->gadget, &req->req, + ep->is_in); if (status && status != -ESHUTDOWN) dev_vdbg(dev->dev, "complete %s req %p stat %d len %u/%u buf %p\n", @@ -850,10 +847,11 @@ net2272_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) return -ESHUTDOWN; /* set up dma mapping in case the caller didn't */ - if (use_dma && ep->dma && _req->dma == DMA_ADDR_INVALID) { - _req->dma = dma_map_single(dev->dev, _req->buf, _req->length, - ep->is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE); - req->mapped = 1; + if (use_dma && ep->dma) { + status = usb_gadget_map_request(&dev->gadget, _req, + ep->is_in); + if (status) + return status; } dev_vdbg(dev->dev, "%s queue req %p, len %d buf %p dma %08llx %s\n", -- 1.7.8.2