From: Frank Li <Frank.Li@nxp.com>
To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org,
peng.fan@nxp.com, vkoul@kernel.org
Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
imx@lists.linux.dev, joy.zou@nxp.com,
linux-kernel@vger.kernel.org, robh+dt@kernel.org,
shenwei.wang@nxp.com
Subject: [PATCH v2 09/12] dmaengine: fsl-edma: refactor chan_name setup and safety
Date: Mon, 29 May 2023 16:04:50 -0400 [thread overview]
Message-ID: <20230529200453.1423796-10-Frank.Li@nxp.com> (raw)
In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com>
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>
---
drivers/dma/fsl-edma-common.h | 2 +-
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 3991956dbc11..39b5f903ba87 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 cd734779f2eb..722ebecdc894 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,
@@ -305,6 +303,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;
--
2.34.1
next prev parent reply other threads:[~2023-05-29 20:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-29 20:04 [PATCH v2 00/12] dmaengine: edma: add freescale edma v3 support Frank Li
2023-05-29 20:04 ` [PATCH v2 01/12] dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c Frank Li
2023-05-31 6:45 ` Peng Fan
2023-05-29 20:04 ` [PATCH v2 02/12] dmaengine: fsl-edma: clean up fsl_edma_irq_exit() Frank Li
2023-05-31 6:46 ` Peng Fan
2023-05-29 20:04 ` [PATCH v2 03/12] dmaengine: fsl-edma: transition from bool fields to bitmask flags in drvdata Frank Li
2023-05-31 6:47 ` Peng Fan
2023-05-29 20:04 ` [PATCH v2 04/12] dmaengine: fsl-edma: remove v3 from enum edma_version Frank Li
2023-05-31 6:50 ` Peng Fan
2023-05-31 12:50 ` Frank Li
2023-05-29 20:04 ` [PATCH v2 05/12] dmaengine: fsl-edma: move common IRQ handler to common.c Frank Li
2023-05-29 20:04 ` [PATCH v2 06/12] dmaengine: fsl-edma: simply ATTR_DSIZE and ATTR_SSIZE by using ffs() Frank Li
2023-05-29 20:04 ` [PATCH v2 07/12] dmaengine: fsl-edma: refactor using devm_clk_get_enabled Frank Li
2023-05-29 20:04 ` [PATCH v2 08/12] dmaengine: fsl-edma: move clearing of register interrupt into setup_irq function Frank Li
2023-05-29 20:04 ` Frank Li [this message]
2023-05-29 20:04 ` [PATCH v2 10/12] dmaengine: fsl-edma: move tcd into struct fsl_dma_chan Frank Li
2023-05-29 20:04 ` [PATCH v2 11/12] dmaengine: fsl-edma: integrate v3 support Frank Li
2023-05-29 20:04 ` [PATCH v2 12/12] dt-bindings: fsl-dma: fsl-edma: add edma3 compatible string Frank Li
2023-05-30 13:08 ` Krzysztof Kozlowski
2023-05-30 13:57 ` Frank Li
2023-05-30 14:41 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230529200453.1423796-10-Frank.Li@nxp.com \
--to=frank.li@nxp.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=imx@lists.linux.dev \
--cc=joy.zou@nxp.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=robh+dt@kernel.org \
--cc=shenwei.wang@nxp.com \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).