dmaengine: fsl-edma: remove 'slave_id' from fsl_edma_chan

The 'slave_id' field is redundant as it duplicates the functionality of
'srcid'. Remove 'slave_id' from fsl_edma_chan to eliminate redundancy.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20240323-8ulp_edma-v3-1-c0e981027c05@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 7bf0aba471a8c719fc3a2d43d2fd3b5473def08a..4cf1de9f0e51224f31a01343c6aaefb6f0b15a97 100644 (file)
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -151,7 +151,6 @@ struct fsl_edma_chan {
        enum dma_status                 status;
        enum fsl_edma_pm_state          pm_state;
        bool                            idle;
-       u32                             slave_id;
        struct fsl_edma_engine          *edma;
        struct fsl_edma_desc            *edesc;
        struct dma_slave_config         cfg;

diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 402f0058a180c8042ff35eea5f556c9e5d648df6..0a6e0c40402745bf009e515ca45b8e0640ec8004 100644 (file)
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -114,8 +114,8 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
                        if (chan) {
                                chan->device->privatecnt++;
                                fsl_chan = to_fsl_edma_chan(chan);
-                               fsl_chan->slave_id = dma_spec->args[1];
-                               fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id,
+                               fsl_chan->srcid = dma_spec->args[1];
+                               fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid,
                                                true);
                                mutex_unlock(&fsl_edma->fsl_edma_mutex);
                                return chan;
@@ -540,7 +540,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
 
                fsl_chan->edma = fsl_edma;
                fsl_chan->pm_state = RUNNING;
-               fsl_chan->slave_id = 0;
+               fsl_chan->srcid = 0;
                fsl_chan->idle = true;
                fsl_chan->dma_dir = DMA_NONE;
                fsl_chan->vchan.desc_free = fsl_edma_free_desc;
@@ -682,8 +682,8 @@ static int fsl_edma_resume_early(struct device *dev)
                        continue;
                fsl_chan->pm_state = RUNNING;
                edma_write_tcdreg(fsl_chan, 0, csr);
-               if (fsl_chan->slave_id != 0)
-                       fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id, true);
+               if (fsl_chan->srcid != 0)
+                       fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid, true);
        }
 
        if (!(fsl_edma->drvdata->flags & FSL_EDMA_DRV_SPLIT_REG))

diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c
index dba63178387678f4a27b05f644bb5d4c4ac402a4..78c606f6d0026ed2a0f12cf53505731afe740878 100644 (file)
--- a/drivers/dma/mcf-edma-main.c
+++ b/drivers/dma/mcf-edma-main.c
@@ -195,7 +195,7 @@ static int mcf_edma_probe(struct platform_device *pdev)
                struct fsl_edma_chan *mcf_chan = &mcf_edma->chans[i];
 
                mcf_chan->edma = mcf_edma;
-               mcf_chan->slave_id = i;
+               mcf_chan->srcid = i;
                mcf_chan->idle = true;
                mcf_chan->dma_dir = DMA_NONE;
                mcf_chan->vchan.desc_free = fsl_edma_free_desc;
@@ -277,7 +277,7 @@ bool mcf_edma_filter_fn(struct dma_chan *chan, void *param)
        if (chan->device->dev->driver == &mcf_edma_driver.driver) {
                struct fsl_edma_chan *mcf_chan = to_fsl_edma_chan(chan);
 
-               return (mcf_chan->slave_id == (uintptr_t)param);
+               return (mcf_chan->srcid == (uintptr_t)param);
        }
 
        return false;