From patchwork Sun Jun 17 17:02:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 10469123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1918060532 for ; Sun, 17 Jun 2018 17:09:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A48B28609 for ; Sun, 17 Jun 2018 17:09:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BDD52865F; Sun, 17 Jun 2018 17:09:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 00D0D28609 for ; Sun, 17 Jun 2018 17:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=JDDCxlcQqQ0xmMyIY1wlriHd39UCBF7Fl+x69b1g1IY=; b=XXwovwRtI257IOJU8jDB0tYQfx NWLuAA6eAv0T7gPj66Xh00SE7XsmFEteAopwbUaq+NNK1uRN4HORpApja3Z55tzIoYY0CpnfyPvAV gBr59u59xJaeapWBOXASVLCC52QlchNrXmYLHjSfOezqZaAJYAW0Xr7DX6zlbSTch/wIS8HMjXdqO TSoENI0YHUaion3kT5qdexaHcuMEk9B7PJTk1pAFDApGbPbeqaPkLT5hBe++idJySKoIio8gyIVTx m1Yxdk8HaojIYGgsx2tTRLA3E0D6G0W8gYQWD2yFT0EuO3l4Zb6TQK5wU7Q3f126/GkoUb2KLSid/ 071g/IYA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUbAf-0002j1-1I; Sun, 17 Jun 2018 17:08:57 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUb5K-00073u-VR for linux-arm-kernel@bombadil.infradead.org; Sun, 17 Jun 2018 17:03:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Gau63SdxmTCnlCaB9S9tMryzDNhy7WtSlXF4O686xp0=; b=R//6dXd5U82kGQGSXFCgkperW t84I+FJRrX/MRn8O8NW/0SgiHK5tc75rjt0u/K7XlZx+A0lC8kUvSTIk0EA93dF+1A7NvNp7H1nPO AWAIDQr4PdpeoDq5Y2pKU9T3vgIonLz9HSU9VasyobYS3a9WFTbXp3J+z1yMkgp/mJbZDBBS1wNIc YB8U7HBNjjhPrHH/T4oG8/iIaGetJVS+YUbdOGLzrtM0E7NxsO/DHMhdH322IiiGuYZFadlgExw2Z AjjTK7nTxQvH0i2/wmsSY7pr5Z+X7+MvIaxbepBxKzNV05i3O6lSKzD2Nra55tXu9O0tGe8zWXcq1 98G4aqyaQ==; Received: from smtp07.smtpout.orange.fr ([80.12.242.129] helo=smtp.smtpout.orange.fr) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUb5G-00068Z-FJ for linux-arm-kernel@lists.infradead.org; Sun, 17 Jun 2018 17:03:24 +0000 Received: from belgarion.home ([90.55.203.186]) by mwinf5d83 with ME id zt2e1x00N41oiFu03t37R5; Sun, 17 Jun 2018 19:03:09 +0200 X-ME-Helo: belgarion.home X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Sun, 17 Jun 2018 19:03:09 +0200 X-ME-IP: 90.55.203.186 From: Robert Jarzmik To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Bartlomiej Zolnierkiewicz , Tejun Heo , Vinod Koul , Mauro Carvalho Chehab , Ulf Hansson , Miquel Raynal , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Nicolas Pitre , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown Subject: [PATCH v3 07/14] net: smc911x: remove the dmaengine compat need Date: Sun, 17 Jun 2018 19:02:10 +0200 Message-Id: <20180617170217.24177-8-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180617170217.24177-1-robert.jarzmik@free.fr> References: <20180617170217.24177-1-robert.jarzmik@free.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180617_130322_832846_E63637D7 X-CRM114-Status: GOOD ( 15.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, netdev@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP As the pxa architecture switched towards the dmaengine slave map, the old compatibility mechanism to acquire the dma requestor line number and priority are not needed anymore. This patch simplifies the dma resource acquisition, using the more generic function dma_request_slave_channel(). Signed-off-by: Robert Jarzmik --- Since v2: converted to NULL filter function and NULL dma parameter call --- drivers/net/ethernet/smsc/smc911x.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c index 05157442a980..b1b53f6c452f 100644 --- a/drivers/net/ethernet/smsc/smc911x.c +++ b/drivers/net/ethernet/smsc/smc911x.c @@ -74,7 +74,6 @@ static const char version[] = #include #include -#include #include @@ -1795,7 +1794,6 @@ static int smc911x_probe(struct net_device *dev) #ifdef SMC_USE_DMA struct dma_slave_config config; dma_cap_mask_t mask; - struct pxad_param param; #endif DBG(SMC_DEBUG_FUNC, dev, "--> %s\n", __func__); @@ -1971,15 +1969,8 @@ static int smc911x_probe(struct net_device *dev) dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - param.prio = PXAD_PRIO_LOWEST; - param.drcmr = -1UL; - - lp->rxdma = - dma_request_slave_channel_compat(mask, pxad_filter_fn, - ¶m, &dev->dev, "rx"); - lp->txdma = - dma_request_slave_channel_compat(mask, pxad_filter_fn, - ¶m, &dev->dev, "tx"); + lp->rxdma = dma_request_channel(mask, NULL, NULL); + lp->txdma = dma_request_channel(mask, NULL, NULL); lp->rxdma_active = 0; lp->txdma_active = 0;