From patchwork Mon Aug 29 11:26:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9303645 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 4056E601C0 for ; Mon, 29 Aug 2016 11:28:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3236C28744 for ; Mon, 29 Aug 2016 11:28:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 272CA2874C; Mon, 29 Aug 2016 11:28:50 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD29D28744 for ; Mon, 29 Aug 2016 11:28:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1beKir-0001hr-Gn; Mon, 29 Aug 2016 11:27:25 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1beKiF-0001R6-TX for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2016 11:26:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=t2dHs6Pz6kdOKyERkE3NdF6PfiGCBk3voFKPHuTNR4E=; b=QDL4ElByL3c6pOIFaMuvtDkPVyP+dedPQPowIr5NkepERc+bvB2UGQTYlA4CuogX9bs6kisOqDWwehEtZxImFBHFCiKow9ZRsSqWAgGSnVh5P24b5qsxkwdTaqoxmkQTlsHYo7k+LSqpsWUB+sGt3W6HpNwMNidu5tjNMSOvOFs=; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:58876 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1beKhf-0004Gd-O9; Mon, 29 Aug 2016 12:26:11 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1beKhe-0001Gt-4k; Mon, 29 Aug 2016 12:26:10 +0100 In-Reply-To: <20160829112540.GF1041@n2100.armlinux.org.uk> References: <20160829112540.GF1041@n2100.armlinux.org.uk> From: Russell King To: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH 2/8] net: irda/sa1100_ir: convert to dma_request_slave_channel() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 29 Aug 2016 12:26:10 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160829_042649_010104_01C372BB X-CRM114-Status: GOOD ( 11.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vinod Koul , Dan Williams , Samuel Ortiz 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 Convert the sa11x0 irda driver to use the more modern dma_request_slave_channel() method to get the DMA channel, rather than using dma_request_channel() with a filter function exported by DMA driver. This allows us to get rid of the sa11x0-dma.h include. Signed-off-by: Russell King --- drivers/net/irda/sa1100_ir.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index b6e44ff4e373..7bc9c2955d4b 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -124,7 +123,7 @@ static int sa1100_irda_dma_request(struct device *dev, struct sa1100_buf *buf, dma_cap_zero(m); dma_cap_set(DMA_SLAVE, m); - buf->chan = dma_request_channel(m, sa11x0_dma_filter_fn, (void *)name); + buf->chan = dma_request_slave_channel(dev, name); if (!buf->chan) { dev_err(dev, "unable to request DMA channel for %s\n", name); @@ -797,12 +796,12 @@ static int sa1100_irda_start(struct net_device *dev) si->speed = 9600; - err = sa1100_irda_dma_request(si->dev, &si->dma_rx, "Ser2ICPRc", + err = sa1100_irda_dma_request(si->dev, &si->dma_rx, "rx", &sa1100_irda_fir_rx); if (err) goto err_rx_dma; - err = sa1100_irda_dma_request(si->dev, &si->dma_tx, "Ser2ICPTr", + err = sa1100_irda_dma_request(si->dev, &si->dma_tx, "tx", &sa1100_irda_sir_tx); if (err) goto err_tx_dma;