From: Baolin Wang <baolin.wang@linaro.org>
To: dan.j.williams@intel.com, vkoul@kernel.org
Cc: jroedel@suse.de, vincent.guittot@linaro.org,
dmaengine@vger.kernel.org, baolin.wang@linaro.org,
festevam@gmail.com, s.hauer@pengutronix.de,
linux-kernel@vger.kernel.org, jonathanh@nvidia.com,
wsa+renesas@sang-engineering.com, thierry.reding@gmail.com,
linux-imx@nxp.com, kernel@pengutronix.de,
linux-tegra@vger.kernel.org, shawnguo@kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/8] dmaengine: imx-sdma: Let the core do the device node validation
Date: Mon, 20 May 2019 19:32:16 +0800 [thread overview]
Message-ID: <77c1171088844b62a50977817103c2cf01fd75ae.1558351667.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <cover.1558351667.git.baolin.wang@linaro.org>
In-Reply-To: <cover.1558351667.git.baolin.wang@linaro.org>
Let the DMA engine core do the device node validation instead of drivers.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
drivers/dma/imx-sdma.c | 9 ++-------
include/linux/platform_data/dma-imx.h | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 99d9f43..ca296f0 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1934,16 +1934,11 @@ static int sdma_init(struct sdma_engine *sdma)
static bool sdma_filter_fn(struct dma_chan *chan, void *fn_param)
{
struct sdma_channel *sdmac = to_sdma_chan(chan);
- struct sdma_engine *sdma = sdmac->sdma;
struct imx_dma_data *data = fn_param;
if (!imx_dma_is_general_purpose(chan))
return false;
- /* return false if it's not the right device */
- if (sdma->dev->of_node != data->of_node)
- return false;
-
sdmac->data = *data;
chan->private = &sdmac->data;
@@ -1971,9 +1966,9 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec,
* be set to sdmac->event_id1.
*/
data.dma_request2 = 0;
- data.of_node = ofdma->of_node;
- return dma_request_channel(mask, sdma_filter_fn, &data);
+ return __dma_request_channel(&mask, sdma_filter_fn, &data,
+ ofdma->of_node);
}
static int sdma_probe(struct platform_device *pdev)
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
index 9daea8d..7d964e7 100644
--- a/include/linux/platform_data/dma-imx.h
+++ b/include/linux/platform_data/dma-imx.h
@@ -55,7 +55,6 @@ struct imx_dma_data {
int dma_request2; /* secondary DMA request line */
enum sdma_peripheral_type peripheral_type;
int priority;
- struct device_node *of_node;
};
static inline int imx_dma_is_ipu(struct dma_chan *chan)
--
1.7.9.5
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-20 11:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 11:32 [PATCH v2 0/8] Add matching device node validation in DMA engine core Baolin Wang
2019-05-20 11:32 ` [PATCH v2 1/8] dmaengine: Add matching device node validation in __dma_request_channel() Baolin Wang
2019-05-20 11:32 ` [PATCH v2 2/8] soc: tegra: fuse: Use dma_request_channel instead of __dma_request_channel() Baolin Wang
2019-05-20 11:32 ` Baolin Wang [this message]
2019-05-20 11:32 ` [PATCH v2 4/8] dmaengine: dma-jz4780: Let the core do the device node validation Baolin Wang
2019-05-20 11:32 ` [PATCH v2 5/8] dmaengine: mmp_tdma: " Baolin Wang
2019-05-20 11:32 ` [PATCH v2 6/8] dmaengine: mxs-dma: " Baolin Wang
2019-05-20 11:32 ` [PATCH v2 7/8] dmaengine: sh: rcar-dmac: " Baolin Wang
2019-05-20 11:32 ` [PATCH v2 8/8] dmaengine: sh: usb-dmac: " Baolin Wang
2019-05-27 5:54 ` [PATCH v2 0/8] Add matching device node validation in DMA engine core Vinod Koul
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=77c1171088844b62a50977817103c2cf01fd75ae.1558351667.git.baolin.wang@linaro.org \
--to=baolin.wang@linaro.org \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=jroedel@suse.de \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=vincent.guittot@linaro.org \
--cc=vkoul@kernel.org \
--cc=wsa+renesas@sang-engineering.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;
as well as URLs for NNTP newsgroup(s).