[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl>
Date: Sun, 22 Apr 2018 13:06:12 +0200
From: Hans Verkuil <hverkuil@...all.nl>
To: Robert Jarzmik <robert.jarzmik@...e.fr>,
Daniel Mack <daniel@...que.org>,
Haojian Zhuang <haojian.zhuang@...il.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>,
Tejun Heo <tj@...nel.org>, Vinod Koul <vinod.koul@...el.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Ulf Hansson <ulf.hansson@...aro.org>,
Ezequiel Garcia <ezequiel.garcia@...e-electrons.com>,
Boris Brezillon <boris.brezillon@...e-electrons.com>,
David Woodhouse <dwmw2@...radead.org>,
Brian Norris <computersforpeace@...il.com>,
Marek Vasut <marek.vasut@...il.com>,
Richard Weinberger <richard@....at>,
Cyrille Pitchen <cyrille.pitchen@...ev4u.fr>,
Nicolas Pitre <nico@...xnic.net>,
Samuel Ortiz <samuel@...tiz.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>, Arnd Bergmann <arnd@...db.de>,
Petr Cvek <petr.cvek@....cz>,
Sakari Ailus <sakari.ailus@....fi>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Pravin Shedge <pravin.shedge4linux@...il.com>,
Flavio Ceolin <flavio.ceolin@...el.com>,
Robert Jarzmik <robert.jarzmik@...ault.com>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-ide@...r.kernel.org, dmaengine@...r.kernel.org,
linux-media@...r.kernel.org, linux-mmc@...r.kernel.org,
linux-mtd@...ts.infradead.org, netdev@...r.kernel.org,
devel@...verdev.osuosl.org, alsa-devel@...a-project.org,
Niklas Söderlund
<niklas.soderlund+renesas@...natech.se>
Subject: Re: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need
On 04/02/2018 04:26 PM, Robert Jarzmik wrote:
> From: Robert Jarzmik <robert.jarzmik@...ault.com>
>
> 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@...e.fr>
Acked-by: Hans Verkuil <hans.verkuil@...co.com>
Regards,
Hans
> ---
> 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,
> - ¶ms, &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,
> - ¶ms, &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,
> - ¶ms, &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;
>
Powered by blists - more mailing lists