linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Daniel Mack <daniel@zonque.org>,
	Haojian Zhuang <haojian.zhuang@gmail.com>,
	Robert Jarzmik <robert.jarzmik@free.fr>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Tejun Heo <tj@kernel.org>, Vinod Koul <vinod.koul@intel.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	Boris Brezillon <boris.brezillon@bootlin.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Brian Norris <computersforpeace@gmail.com>,
	Marek Vasut <marek.vasut@gmail.com>,
	Richard Weinberger <richard@nod.at>,
	Nicolas Pitre <nico@fluxnic.net>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>
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, alsa-devel@alsa-project.org
Subject: [PATCH v3 10/14] ata: pata_pxa: remove the dmaengine compat need
Date: Sun, 17 Jun 2018 19:02:13 +0200	[thread overview]
Message-ID: <20180617170217.24177-11-robert.jarzmik@free.fr> (raw)
In-Reply-To: <20180617170217.24177-1-robert.jarzmik@free.fr>

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 <robert.jarzmik@free.fr>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
 drivers/ata/pata_pxa.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index f6c46e9a4dc0..e8b6a2e464c9 100644
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -25,7 +25,6 @@
 #include <linux/libata.h>
 #include <linux/platform_device.h>
 #include <linux/dmaengine.h>
-#include <linux/dma/pxa-dma.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
@@ -180,8 +179,6 @@ static int pxa_ata_probe(struct platform_device *pdev)
 	struct resource *irq_res;
 	struct pata_pxa_pdata *pdata = dev_get_platdata(&pdev->dev);
 	struct dma_slave_config	config;
-	dma_cap_mask_t mask;
-	struct pxad_param param;
 	int ret = 0;
 
 	/*
@@ -278,10 +275,6 @@ static int pxa_ata_probe(struct platform_device *pdev)
 
 	ap->private_data = data;
 
-	dma_cap_zero(mask);
-	dma_cap_set(DMA_SLAVE, mask);
-	param.prio = PXAD_PRIO_LOWEST;
-	param.drcmr = pdata->dma_dreq;
 	memset(&config, 0, sizeof(config));
 	config.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 	config.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
@@ -294,8 +287,7 @@ static int pxa_ata_probe(struct platform_device *pdev)
 	 * Request the DMA channel
 	 */
 	data->dma_chan =
-		dma_request_slave_channel_compat(mask, pxad_filter_fn,
-						 &param, &pdev->dev, "data");
+		dma_request_slave_channel(&pdev->dev, "data");
 	if (!data->dma_chan)
 		return -EBUSY;
 	ret = dmaengine_slave_config(data->dma_chan, &config);
-- 
2.11.0


  parent reply	other threads:[~2018-06-17 17:05 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-17 17:02 [PATCH v3 00/14] ARM: pxa: switch to DMA slave maps Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 01/14] dmaengine: pxa: use a dma slave map Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 02/14] ARM: pxa: add " Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 03/14] dmaengine: pxa: add a default requestor policy Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 04/14] mmc: pxamci: remove the dmaengine compat need Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 05/14] media: pxa_camera: " Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 06/14] mtd: rawnand: marvell: " Robert Jarzmik
2018-06-17 18:12   ` Daniel Mack
2018-06-18 19:31     ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 07/14] net: smc911x: " Robert Jarzmik
2018-06-20 17:17   ` Robert Jarzmik
2018-06-20 23:39     ` David Miller
2018-06-21  8:43       ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 08/14] net: smc91x: " Robert Jarzmik
2018-06-20 17:17   ` Robert Jarzmik
2018-06-20 23:40     ` David Miller
2018-06-21  8:44       ` Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 09/14] ASoC: pxa: " Robert Jarzmik
2018-06-17 18:17   ` Daniel Mack
2018-06-21  8:50     ` Robert Jarzmik
2018-06-17 17:02 ` Robert Jarzmik [this message]
2018-06-17 17:02 ` [PATCH v3 11/14] dmaengine: pxa: document pxad_param Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 12/14] dmaengine: pxa: make the filter function internal Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 13/14] ARM: pxa: remove the DMA IO resources Robert Jarzmik
2018-06-17 17:02 ` [PATCH v3 14/14] ARM: pxa: change SSP DMA channels allocation Robert Jarzmik
2018-06-18  8:41 ` [PATCH v3 00/14] ARM: pxa: switch to DMA slave maps Boris Brezillon
2018-06-18 19:56   ` Robert Jarzmik
2018-06-18 20:04     ` Boris Brezillon
2018-06-20 17:07       ` Robert Jarzmik
2018-06-25 13:07     ` Mark Brown
2018-06-27 15:11       ` Robert Jarzmik
2018-06-27 21:03         ` Daniel Mack
2018-06-28 11:52           ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180617170217.24177-11-robert.jarzmik@free.fr \
    --to=robert.jarzmik@free.fr \
    --cc=alsa-devel@alsa-project.org \
    --cc=b.zolnierkie@samsung.com \
    --cc=boris.brezillon@bootlin.com \
    --cc=broonie@kernel.org \
    --cc=computersforpeace@gmail.com \
    --cc=daniel@zonque.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=dwmw2@infradead.org \
    --cc=haojian.zhuang@gmail.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=marek.vasut@gmail.com \
    --cc=mchehab@kernel.org \
    --cc=miquel.raynal@bootlin.com \
    --cc=netdev@vger.kernel.org \
    --cc=nico@fluxnic.net \
    --cc=perex@perex.cz \
    --cc=richard@nod.at \
    --cc=tiwai@suse.com \
    --cc=tj@kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).