diff options
| author | Frank Li <Frank.Li@nxp.com> | 2023-08-21 12:16:14 -0400 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2023-08-22 20:11:03 +0530 |
| commit | 9b05554c5ca6829a60c610191d45f244d8726e95 (patch) | |
| tree | b1fd9b72e132215fee1a13b8b7d7a0f6ed75912f /drivers/dma | |
| parent | f5b3ba52f36adcda7801fba99c414975f19c85d4 (diff) | |
| download | linux-stable-9b05554c5ca6829a60c610191d45f244d8726e95.tar.gz linux-stable-9b05554c5ca6829a60c610191d45f244d8726e95.tar.bz2 linux-stable-9b05554c5ca6829a60c610191d45f244d8726e95.zip | |
dmaengine: fsl-edma: refactor chan_name setup and safety
Relocated the setup of chan_name from setup_irq() to fsl_chan init. This
change anticipates its future use in various locations.
For increased safety, sprintf has been replaced with snprintf. In addition,
The size of the fsl_chan->name[] array was expanded from 16 to 32.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20230821161617.2142561-10-Frank.Li@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/fsl-edma-common.h | 2 | ||||
| -rw-r--r-- | drivers/dma/fsl-edma-main.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 521b79fc3828..316df42ae5cb 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -116,7 +116,7 @@ struct fsl_edma_chan { dma_addr_t dma_dev_addr; u32 dma_dev_size; enum dma_data_direction dma_dir; - char chan_name[16]; + char chan_name[32]; }; struct fsl_edma_desc { diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 111cfa2c4572..d68ea16ddf1b 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -175,8 +175,6 @@ fsl_edma2_irq_init(struct platform_device *pdev, if (irq < 0) return -ENXIO; - sprintf(fsl_edma->chans[i].chan_name, "eDMA2-CH%02d", i); - /* The last IRQ is for eDMA err */ if (i == count - 1) ret = devm_request_irq(&pdev->dev, irq, @@ -313,6 +311,9 @@ static int fsl_edma_probe(struct platform_device *pdev) for (i = 0; i < fsl_edma->n_chans; i++) { struct fsl_edma_chan *fsl_chan = &fsl_edma->chans[i]; + snprintf(fsl_chan->chan_name, sizeof(fsl_chan->chan_name), "%s-CH%02d", + dev_name(&pdev->dev), i); + fsl_chan->edma = fsl_edma; fsl_chan->pm_state = RUNNING; fsl_chan->slave_id = 0; |