Received: by 10.213.65.68 with SMTP id h4csp2431980imn; Mon, 2 Apr 2018 07:29:38 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/tG6H+nLKM8y4+P/2vVDjVJqeb8p7Kzi9UdzkO+23hq5PwjwJ1WHtdJ2sJ04qF4t811GZK X-Received: by 10.98.152.22 with SMTP id q22mr7579496pfd.178.1522679378000; Mon, 02 Apr 2018 07:29:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522679377; cv=none; d=google.com; s=arc-20160816; b=GKD4iVHfZ8+aTxJI/nI3OwSK/jTDpBL5jktPAFIl1QYQ0FQZn2sj3kjiQIuVF9qSw2 KBUQJpV57qwepAegBpOMmLU8y6XopE+ih46nFY5/gswe73oqoEDHw/OiqVu0CiEn728B ZsSeFNBJLYoY1um0S0TkCysmuoWjskya69lAplM/GQcpASB0iSGuWQTzMk+Ss1FVYhVh mLFMf1Yuren+s0J2c8n9XBDPOFCGMimC2a0w9tc3RKN9Rm2/KueEGhf35MAHXrbOg8Tf DJYwJSU7A3Ql/SqMuSNSPqG3jFDHfKOY+OGoTFmJSnt4D7w7bRZPykKcvm+egwaq3lmG wdUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=gFgJviuQ4gN30UHSe6Y8DHNIFeqVVROJ7HLRGNzpMCs=; b=n9kHSGn3b2LeGxIfrO9yZlqL1jSZ3hqTFGJaFPn0uSpN5/4AywEVt53yi/wv5a2Ej9 Es88Xx5eBNEwQy77iij0x7+umQsNhPkx7qZ4oOJvDwA39ETWAWb0hvcFKuFPR5SseUSg bQ74Gg/ZZFfZtzVKyL5uUEPJu0sfM2lguaMiSRUVzzXYhgDhcgJfFk+Brxi8egcjYMP8 Z+bfQsN0mEuKfiozKfRNyu+ui0CfAUXiomokO7cUe0TDfBoDXyF8aq0fHmvrSfS7xVsg G01YTLToTKvyrC/siNL9Fwynf4HZzxu4XKpaK/OEkgTCXVHnullcr0jLyDYJgGfi2qtU X+8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c3-v6si450236pls.123.2018.04.02.07.29.24; Mon, 02 Apr 2018 07:29:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752558AbeDBO1w (ORCPT + 99 others); Mon, 2 Apr 2018 10:27:52 -0400 Received: from smtp06.smtpout.orange.fr ([80.12.242.128]:50181 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbeDBO1o (ORCPT ); Mon, 2 Apr 2018 10:27:44 -0400 Received: from belgarion.home ([86.201.130.131]) by mwinf5d63 with ME id VSSy1x00R2qEl8e03SThG6; Mon, 02 Apr 2018 16:27:42 +0200 X-ME-Helo: belgarion.home X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Mon, 02 Apr 2018 16:27:42 +0200 X-ME-IP: 86.201.130.131 From: Robert Jarzmik To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Bartlomiej Zolnierkiewicz , Tejun Heo , Vinod Koul , Mauro Carvalho Chehab , Ulf Hansson , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Nicolas Pitre , Samuel Ortiz , Greg Kroah-Hartman , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, Robert Jarzmik Subject: [PATCH 05/15] mtd: nand: pxa3xx: remove the dmaengine compat need Date: Mon, 2 Apr 2018 16:26:46 +0200 Message-Id: <20180402142656.26815-6-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180402142656.26815-1-robert.jarzmik@free.fr> References: <20180402142656.26815-1-robert.jarzmik@free.fr> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Jarzmik 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 --- drivers/mtd/nand/pxa3xx_nand.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index d1979c7dbe7e..4a56a0aef5b1 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1518,8 +1518,6 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info) { struct platform_device *pdev = info->pdev; struct dma_slave_config config; - dma_cap_mask_t mask; - struct pxad_param param; int ret; info->data_buff = kmalloc(info->buf_size, GFP_KERNEL); @@ -1533,13 +1531,7 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info) return ret; sg_init_one(&info->sg, info->data_buff, info->buf_size); - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - param.prio = PXAD_PRIO_LOWEST; - param.drcmr = info->drcmr_dat; - info->dma_chan = dma_request_slave_channel_compat(mask, pxad_filter_fn, - ¶m, &pdev->dev, - "data"); + info->dma_chan = dma_request_slave_channel(&pdev->dev, "data"); if (!info->dma_chan) { dev_err(&pdev->dev, "unable to request data dma channel\n"); return -ENODEV; -- 2.11.0