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>,
	Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Brian Norris <computersforpeace@gmail.com>,
	Marek Vasut <marek.vasut@gmail.com>,
	Richard Weinberger <richard@nod.at>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Arnd Bergmann <arnd@arndb.de>
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 v2 04/13] media: pxa_camera: remove the dmaengine compat need
Date: Thu, 24 May 2018 09:06:54 +0200	[thread overview]
Message-ID: <20180524070703.11901-5-robert.jarzmik@free.fr> (raw)
In-Reply-To: <20180524070703.11901-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: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 drivers/media/platform/pxa_camera.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index c71a00736541..4c82d1880753 100644
--- a/drivers/media/platform/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
@@ -2357,8 +2357,6 @@ static int pxa_camera_probe(struct platform_device *pdev)
 		.src_maxburst = 8,
 		.direction = DMA_DEV_TO_MEM,
 	};
-	dma_cap_mask_t mask;
-	struct pxad_param params;
 	char clk_name[V4L2_CLK_NAME_SIZE];
 	int irq;
 	int err = 0, i;
@@ -2432,34 +2430,20 @@ static int pxa_camera_probe(struct platform_device *pdev)
 	pcdev->base = base;
 
 	/* request dma */
-	dma_cap_zero(mask);
-	dma_cap_set(DMA_SLAVE, mask);
-	dma_cap_set(DMA_PRIVATE, mask);
-
-	params.prio = 0;
-	params.drcmr = 68;
-	pcdev->dma_chans[0] =
-		dma_request_slave_channel_compat(mask, pxad_filter_fn,
-						 &params, &pdev->dev, "CI_Y");
+	pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y");
 	if (!pcdev->dma_chans[0]) {
 		dev_err(&pdev->dev, "Can't request DMA for Y\n");
 		return -ENODEV;
 	}
 
-	params.drcmr = 69;
-	pcdev->dma_chans[1] =
-		dma_request_slave_channel_compat(mask, pxad_filter_fn,
-						 &params, &pdev->dev, "CI_U");
+	pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U");
 	if (!pcdev->dma_chans[1]) {
 		dev_err(&pdev->dev, "Can't request DMA for Y\n");
 		err = -ENODEV;
 		goto exit_free_dma_y;
 	}
 
-	params.drcmr = 70;
-	pcdev->dma_chans[2] =
-		dma_request_slave_channel_compat(mask, pxad_filter_fn,
-						 &params, &pdev->dev, "CI_V");
+	pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V");
 	if (!pcdev->dma_chans[2]) {
 		dev_err(&pdev->dev, "Can't request DMA for V\n");
 		err = -ENODEV;
-- 
2.11.0

  parent reply	other threads:[~2018-05-24  7:09 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-24  7:06 [PATCH v2 00/13] ARM: pxa: switch to DMA slave maps Robert Jarzmik
2018-05-24  7:06 ` [PATCH v2 01/13] dmaengine: pxa: use a dma slave map Robert Jarzmik
2018-06-25 13:15   ` Applied "dmaengine: pxa: use a dma slave map" to the asoc tree Mark Brown
2018-05-24  7:06 ` [PATCH v2 02/13] ARM: pxa: add dma slave map Robert Jarzmik
2018-05-24 18:11   ` Robert Jarzmik
2018-05-24  7:06 ` [PATCH v2 03/13] mmc: pxamci: remove the dmaengine compat need Robert Jarzmik
2018-06-25 13:15   ` Applied "mmc: pxamci: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24  7:06 ` Robert Jarzmik [this message]
2018-06-25 13:15   ` Applied "media: pxa_camera: " Mark Brown
2018-05-24  7:06 ` [PATCH v2 05/13] mtd: rawnand: marvell: remove the dmaengine compat need Robert Jarzmik
2018-05-24  9:30   ` Miquel Raynal
2018-05-24 18:07     ` Robert Jarzmik
2018-05-25  6:56       ` Miquel Raynal
2018-05-24  7:06 ` [PATCH v2 06/13] net: smc911x: " Robert Jarzmik
2018-05-24  7:06 ` [PATCH v2 07/13] net: smc91x: " Robert Jarzmik
2018-05-24  7:06 ` [PATCH v2 08/13] ASoC: pxa: " Robert Jarzmik
2018-05-24 13:58   ` Mark Brown
2018-05-25  8:35   ` Daniel Mack
2018-06-29 11:07   ` Applied "ASoC: pxa: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24  7:06 ` [PATCH v2 09/13] ata: pata_pxa: remove the dmaengine compat need Robert Jarzmik
2018-06-25 13:15   ` Applied "ata: pata_pxa: remove the dmaengine compat need" to the asoc tree Mark Brown
2018-05-24  7:07 ` [PATCH v2 10/13] dmaengine: pxa: document pxad_param Robert Jarzmik
2018-05-25 10:59   ` Vinod
2018-06-25 13:15   ` Applied "dmaengine: pxa: document pxad_param" to the asoc tree Mark Brown
2018-05-24  7:07 ` [PATCH v2 11/13] dmaengine: pxa: make the filter function internal Robert Jarzmik
2018-05-25 10:59   ` Vinod
2018-05-24  7:07 ` [PATCH v2 12/13] ARM: pxa: remove the DMA IO resources Robert Jarzmik
2018-06-25 13:15   ` Applied "ARM: pxa: remove the DMA IO resources" to the asoc tree Mark Brown
2018-05-24  7:07 ` [PATCH v2 13/13] ARM: pxa: change SSP DMA channels allocation Robert Jarzmik
2018-05-25  7:56   ` Daniel Mack
2018-06-25 13:15   ` Applied "ARM: pxa: change SSP DMA channels allocation" to the asoc tree 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=20180524070703.11901-5-robert.jarzmik@free.fr \
    --to=robert.jarzmik@free.fr \
    --cc=alsa-devel@alsa-project.org \
    --cc=arnd@arndb.de \
    --cc=boris.brezillon@free-electrons.com \
    --cc=broonie@kernel.org \
    --cc=computersforpeace@gmail.com \
    --cc=daniel@zonque.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=dwmw2@infradead.org \
    --cc=ezequiel.garcia@free-electrons.com \
    --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=netdev@vger.kernel.org \
    --cc=richard@nod.at \
    /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).