From: Frank.Li@oss.nxp.com
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Frank Li <Frank.Li@nxp.com>,
Alok Tiwari <alok.a.tiwari@oracle.com>,
Runyu Xiao <runyu.xiao@seu.edu.cn>, Chen Ni <nichen@iscas.ac.cn>,
Kees Cook <kees+treewide@kernel.org>,
Hemanth Selam <hemanth.selam@gmail.com>,
linux-mtd@lists.infradead.org (open list:CADENCE NAND DRIVER),
linux-kernel@vger.kernel.org (open list)
Cc: imx@lists.linux.dev
Subject: [PATCH 1/1] mtd: nand: raw: use dmaengine accessor API functions
Date: Wed, 11 Nov 2026 15:24:45 -0500 [thread overview]
Message-ID: <20261111202502.3860647-1-Frank.Li@oss.nxp.com> (raw)
From: Frank Li <Frank.Li@nxp.com>
Use dmaengine_get_dma_device() instead of directly accessing chan->device
and use dmaengine_prep_dma_memcpy() instead of calling the function pointer
directly. This follows the dmaengine API convention of using accessor
helpers to decouple drivers from internal dmaengine structures.
Affects cadence-nand-controller and fsmc_nand drivers.
No functional change and prepare to move struct dma_device to private.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
.../mtd/nand/raw/cadence-nand-controller.c | 22 +++++++++----------
drivers/mtd/nand/raw/fsmc_nand.c | 13 +++++------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 41a5219a4d4ed..256a372119655 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -1873,16 +1873,16 @@ static int cadence_nand_slave_dma_transfer(struct cdns_nand_ctrl *cdns_ctrl,
{
DECLARE_COMPLETION_ONSTACK(finished);
struct dma_chan *chan;
- struct dma_device *dma_dev;
+ struct device *dma_dev;
dma_addr_t src_dma, dst_dma, buf_dma;
struct dma_async_tx_descriptor *tx;
dma_cookie_t cookie;
chan = cdns_ctrl->dmac;
- dma_dev = chan->device;
+ dma_dev = dmaengine_get_dma_device(chan);
- buf_dma = dma_map_single(dma_dev->dev, buf, len, dir);
- if (dma_mapping_error(dma_dev->dev, buf_dma)) {
+ buf_dma = dma_map_single(dma_dev, buf, len, dir);
+ if (dma_mapping_error(dma_dev, buf_dma)) {
dev_err(cdns_ctrl->dev, "Failed to map DMA buffer\n");
goto err;
}
@@ -1913,12 +1913,12 @@ static int cadence_nand_slave_dma_transfer(struct cdns_nand_ctrl *cdns_ctrl,
dma_async_issue_pending(cdns_ctrl->dmac);
wait_for_completion(&finished);
- dma_unmap_single(dma_dev->dev, buf_dma, len, dir);
+ dma_unmap_single(dma_dev, buf_dma, len, dir);
return 0;
err_unmap:
- dma_unmap_single(dma_dev->dev, buf_dma, len, dir);
+ dma_unmap_single(dma_dev, buf_dma, len, dir);
err:
dev_dbg(cdns_ctrl->dev, "Fall back to CPU I/O\n");
@@ -3125,7 +3125,7 @@ cadence_nand_irq_cleanup(int irqnum, struct cdns_nand_ctrl *cdns_ctrl)
static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
{
dma_cap_mask_t mask;
- struct dma_device *dma_dev;
+ struct device *dma_dev;
int ret;
cdns_ctrl->cdma_desc = dma_alloc_coherent(cdns_ctrl->dev,
@@ -3169,12 +3169,12 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
}
}
- dma_dev = cdns_ctrl->dmac->device;
- cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev->dev, cdns_ctrl->io.dma,
+ dma_dev = dmaengine_get_dma_device(cdns_ctrl->dmac);
+ cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev, cdns_ctrl->io.dma,
cdns_ctrl->io.size,
DMA_BIDIRECTIONAL, 0);
- ret = dma_mapping_error(dma_dev->dev, cdns_ctrl->io.iova_dma);
+ ret = dma_mapping_error(dma_dev, cdns_ctrl->io.iova_dma);
if (ret) {
dev_err(cdns_ctrl->dev, "Failed to map I/O resource to DMA\n");
goto dma_release_chnl;
@@ -3203,7 +3203,7 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
return 0;
unmap_dma_resource:
- dma_unmap_resource(dma_dev->dev, cdns_ctrl->io.iova_dma,
+ dma_unmap_resource(dma_dev, cdns_ctrl->io.iova_dma,
cdns_ctrl->io.size, DMA_BIDIRECTIONAL, 0);
dma_release_chnl:
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index e28a69ceb0663..7b5e74dff7bdd 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -486,7 +486,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
enum dma_data_direction direction)
{
struct dma_chan *chan;
- struct dma_device *dma_dev;
+ struct device *dma_dev;
struct dma_async_tx_descriptor *tx;
dma_addr_t dma_dst, dma_src, dma_addr;
dma_cookie_t cookie;
@@ -501,9 +501,9 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
else
return -EINVAL;
- dma_dev = chan->device;
- dma_addr = dma_map_single(dma_dev->dev, buffer, len, direction);
- if (dma_mapping_error(dma_dev->dev, dma_addr))
+ dma_dev = dmaengine_get_dma_device(chan);
+ dma_addr = dma_map_single(dma_dev, buffer, len, direction);
+ if (dma_mapping_error(dma_dev, dma_addr))
return -EINVAL;
if (direction == DMA_TO_DEVICE) {
@@ -514,8 +514,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
dma_dst = dma_addr;
}
- tx = dma_dev->device_prep_dma_memcpy(chan, dma_dst, dma_src,
- len, flags);
+ tx = dmaengine_prep_dma_memcpy(chan, dma_dst, dma_src, len, flags);
if (!tx) {
dev_err(host->dev, "device_prep_dma_memcpy error\n");
ret = -EIO;
@@ -546,7 +545,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
ret = 0;
unmap_dma:
- dma_unmap_single(dma_dev->dev, dma_addr, len, direction);
+ dma_unmap_single(dma_dev, dma_addr, len, direction);
return ret;
}
--
2.43.0
reply other threads:[~2026-11-11 20:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261111202502.3860647-1-Frank.Li@oss.nxp.com \
--to=frank.li@oss.nxp.com \
--cc=Frank.Li@nxp.com \
--cc=alok.a.tiwari@oracle.com \
--cc=hemanth.selam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kees+treewide@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=nichen@iscas.ac.cn \
--cc=richard@nod.at \
--cc=runyu.xiao@seu.edu.cn \
--cc=vigneshr@ti.com \
/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
all inboxes | Powered by JetHome®