From patchwork Tue Jul 17 10:53:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1204721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 765F0DF25A for ; Tue, 17 Jul 2012 11:01:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sr5SB-0000G3-NE; Tue, 17 Jul 2012 10:56:31 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sr5Pm-0008LH-5G for linux-arm-kernel@lists.infradead.org; Tue, 17 Jul 2012 10:54:03 +0000 Received: from axis700.grange (dslb-178-006-245-103.pools.arcor-ip.net [178.6.245.103]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0M5P83-1TnkeA37OB-00zX43; Tue, 17 Jul 2012 12:53:58 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 61E0A189B14; Tue, 17 Jul 2012 12:53:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 5EFF4189B12; Tue, 17 Jul 2012 12:53:57 +0200 (CEST) Date: Tue, 17 Jul 2012 12:53:57 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Vinod Koul Subject: [PATCH/RFC 4/4] mmc: sh_mmcif: switch to using dma_request_slave_channel() In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:UW8p6w16cLESYM/9OtlvybG5iMSPv8J3hc6wwN4d+ue JyByugtMHWlj5JZfu7kwcAfw27cIX+AWUnM0ff6yCwpxeJK47n 24oDu3Oc1srDhotblzPCdwrVRtZJAWUYJ/ydfAFeIAvZYrDThM b0QRWbERm/+clywCTzA4LfAyut1mtFl1bZIIg9gb8jYscMYkGj xfSlth+wrSqy5b3OvILbYdFnIbPAERE64KiR7GqRur6T1QaIzX T5nSJnvUfXxjbRwKp+1qoKGDb+cXom/1c39ynPK/9h5tzsWDyY bTF0CnzEAC5VaJrvG/l+ikzFkB1unSBKKDcRwQUWjrCV+rJ3rQ K5genKfF9Hs2+xkKq9juvA85DyEh3waVZQcrj9m89vIdK9+9lU 2tlvHgD2C0cYw== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (g.liakhovetski[at]gmx.de) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 1.0 MALFORMED_FREEMAIL Bad headers on message from free email service Cc: Stephen Warren , Benoit Cousson , Arnd Bergmann , Stephen Warren , Magnus Damm , linux-sh@vger.kernel.org, Nicolas Ferre , Rob Herring , Grant Likely , Jassi Brar , Jon Hunter , Russell King - ARM Linux , dan.j.williams@intel.com, linux-arm X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use dma_request_slave_channel() to obtain DMA channels, which eliminates the need for a filter function. Signed-off-by: Guennadi Liakhovetski --- This shall only be applied after all MMCIF users, using DMA, have been converted drivers/mmc/host/sh_mmcif.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 0f07d28..cb71410 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -386,8 +386,7 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host *host, dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - host->chan_tx = dma_request_channel(mask, shdma_chan_filter, - (void *)pdata->slave_id_tx); + host->chan_tx = dma_request_slave_channel(&host->pd->dev, DMA_MEM_TO_DEV, NULL); dev_dbg(&host->pd->dev, "%s: TX: got channel %p\n", __func__, host->chan_tx); @@ -402,8 +401,7 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host *host, if (ret < 0) goto ecfgtx; - host->chan_rx = dma_request_channel(mask, shdma_chan_filter, - (void *)pdata->slave_id_rx); + host->chan_rx = dma_request_slave_channel(&host->pd->dev, DMA_DEV_TO_MEM, NULL); dev_dbg(&host->pd->dev, "%s: RX: got channel %p\n", __func__, host->chan_rx);