]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dmaengine: pxa/mmp: stop referencing config->slave_id
authorArnd Bergmann <arnd@arndb.de>
Mon, 22 Nov 2021 22:21:58 +0000 (23:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 07:46:16 +0000 (08:46 +0100)
[ Upstream commit 134c37fa250a87a7e77c80a7c59ae16c462e46e0 ]

The last driver referencing the slave_id on Marvell PXA and MMP platforms
was the SPI driver, but this stopped doing so a long time ago, so the
TODO from the earlier patch can no be removed.

Fixes: b729bf34535e ("spi/pxa2xx: Don't use slave_id of dma_slave_config")
Fixes: 13b3006b8ebd ("dma: mmp_pdma: add filter function")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20211122222203.4103644-7-arnd@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/mmp_pdma.c
drivers/dma/pxa_dma.c

index e39457f13d4dd4d923b022312f883dfc39f99ba7..548600ce6cc87f5eca56a7d0aadaf59313b1674c 100644 (file)
@@ -723,12 +723,6 @@ static int mmp_pdma_config(struct dma_chan *dchan,
 
        chan->dir = cfg->direction;
        chan->dev_addr = addr;
-       /* FIXME: drivers should be ported over to use the filter
-        * function. Once that's done, the following two lines can
-        * be removed.
-        */
-       if (cfg->slave_id)
-               chan->drcmr = cfg->slave_id;
 
        return 0;
 }
index 4251e9ac0373c6486f66d4641c6db507a9198a45..ff2e28137a7b1ccd8e727ba4a9bcfa19d82e7611 100644 (file)
@@ -959,13 +959,6 @@ static void pxad_get_config(struct pxad_chan *chan,
                *dcmd |= PXA_DCMD_BURST16;
        else if (maxburst == 32)
                *dcmd |= PXA_DCMD_BURST32;
-
-       /* FIXME: drivers should be ported over to use the filter
-        * function. Once that's done, the following two lines can
-        * be removed.
-        */
-       if (chan->cfg.slave_id)
-               chan->drcmr = chan->cfg.slave_id;
 }
 
 static struct dma_async_tx_descriptor *