Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 273340e8 authored by Robert Jarzmik's avatar Robert Jarzmik
Browse files

ata: pata_pxa: remove the dmaengine compat need 



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: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent ac75a50b

drivers/ata/pata_pxa.c

+1 −9
Original line number Diff line number Diff line
@@ -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);