diff options
| author | Robert Jarzmik | 2018-06-17 19:02:09 +0200 |
|---|---|---|
| committer | Robert Jarzmik | 2018-06-18 21:30:17 +0200 |
| commit | ac75a50b6de3b092d084fdd9818707d0d5073ad6 (patch) | |
| tree | f4b39f5e45eb19984902ff874bf79affecaae27b /drivers/mtd/nand/raw | |
| parent | media: pxa_camera: remove the dmaengine compat need (diff) | |
| download | kernel-qcow2-linux-ac75a50b6de3b092d084fdd9818707d0d5073ad6.tar.gz kernel-qcow2-linux-ac75a50b6de3b092d084fdd9818707d0d5073ad6.tar.xz kernel-qcow2-linux-ac75a50b6de3b092d084fdd9818707d0d5073ad6.zip | |
mtd: rawnand: marvell: 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: Daniel Mack <daniel@zonque.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd/nand/raw')
| -rw-r--r-- | drivers/mtd/nand/raw/marvell_nand.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c index ebb1d141b900..00d9f29bbdb6 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c @@ -2612,8 +2612,6 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) dev); struct dma_slave_config config = {}; struct resource *r; - dma_cap_mask_t mask; - struct pxad_param param; int ret; if (!IS_ENABLED(CONFIG_PXA_DMA)) { @@ -2626,20 +2624,7 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) if (ret) return ret; - r = platform_get_resource(pdev, IORESOURCE_DMA, 0); - if (!r) { - dev_err(nfc->dev, "No resource defined for data DMA\n"); - return -ENXIO; - } - - param.drcmr = r->start; - param.prio = PXAD_PRIO_LOWEST; - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - nfc->dma_chan = - dma_request_slave_channel_compat(mask, pxad_filter_fn, - ¶m, nfc->dev, - "data"); + nfc->dma_chan = dma_request_slave_channel(nfc->dev, "data"); if (!nfc->dma_chan) { dev_err(nfc->dev, "Unable to request data DMA channel\n"); |