lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 079/186] dmaengine: pxa/mmp: stop referencing config->slave_id
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ 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 | 6 ------
    drivers/dma/pxa_dma.c | 7 -------
    2 files changed, 13 deletions(-)

    diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
    index eb3a1f42ab065..e8b2d3e31de80 100644
    --- a/drivers/dma/mmp_pdma.c
    +++ b/drivers/dma/mmp_pdma.c
    @@ -722,12 +722,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;
    }
    diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c
    index b53fb618bbf6b..99a8ff130ad51 100644
    --- a/drivers/dma/pxa_dma.c
    +++ b/drivers/dma/pxa_dma.c
    @@ -956,13 +956,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 *
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 20:18    [W:4.315 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site