diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
| commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
| tree | 67c98488983a71305e24940930d6e27a96d54db2 /drivers/mtd | |
| parent | 6c084839877666d987ff8bc4e0facd3c02d99d61 (diff) | |
| parent | f2cf0ef7c0ce141bb38f315c34c56e6ef5667a27 (diff) | |
| download | linux-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.tar.gz linux-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.tar.bz2 linux-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.zip | |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'drivers/mtd')
| -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"); |