From: Vinod Koul <vkoul@kernel.org>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
lars@metafoo.de, dan.j.williams@intel.com,
ardeleanalex@gmail.com
Subject: Re: [PATCH 3/5] dmaengine: axi-dmac: wrap entire dt parse in a function
Date: Tue, 25 Aug 2020 16:55:17 +0530 [thread overview]
Message-ID: <20200825112517.GP2639@vkoul-mobl> (raw)
In-Reply-To: <20200819071633.76494-3-alexandru.ardelean@analog.com>
On 19-08-20, 10:16, Alexandru Ardelean wrote:
> All these attributes will be read from registers in newer core versions, so
> just wrap the logic into a function.
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
> ---
> drivers/dma/dma-axi-dmac.c | 39 ++++++++++++++++++++++++--------------
> 1 file changed, 25 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
> index 07665c60c21b..473c4a159c89 100644
> --- a/drivers/dma/dma-axi-dmac.c
> +++ b/drivers/dma/dma-axi-dmac.c
> @@ -774,6 +774,28 @@ static int axi_dmac_parse_chan_dt(struct device_node *of_chan,
> return 0;
> }
>
> +static int axi_dmac_parse_dt(struct device *dev, struct axi_dmac *dmac)
> +{
> + struct device_node *of_channels, *of_chan;
> + int ret;
> +
> + of_channels = of_get_child_by_name(dev->of_node, "adi,channels");
> + if (of_channels == NULL)
> + return -ENODEV;
> +
> + for_each_child_of_node(of_channels, of_chan) {
> + ret = axi_dmac_parse_chan_dt(of_chan, &dmac->chan);
> + if (ret) {
> + of_node_put(of_chan);
> + of_node_put(of_channels);
> + return -EINVAL;
> + }
> + }
> + of_node_put(of_channels);
> +
> + return 0;
> +}
> +
> static int axi_dmac_detect_caps(struct axi_dmac *dmac, unsigned int version)
> {
> struct axi_dmac_chan *chan = &dmac->chan;
> @@ -823,7 +845,6 @@ static int axi_dmac_detect_caps(struct axi_dmac *dmac, unsigned int version)
>
> static int axi_dmac_probe(struct platform_device *pdev)
> {
> - struct device_node *of_channels, *of_chan;
> struct dma_device *dma_dev;
> struct axi_dmac *dmac;
> struct resource *res;
> @@ -856,19 +877,9 @@ static int axi_dmac_probe(struct platform_device *pdev)
>
> INIT_LIST_HEAD(&dmac->chan.active_descs);
>
> - of_channels = of_get_child_by_name(pdev->dev.of_node, "adi,channels");
> - if (of_channels == NULL)
> - return -ENODEV;
> -
> - for_each_child_of_node(of_channels, of_chan) {
> - ret = axi_dmac_parse_chan_dt(of_chan, &dmac->chan);
> - if (ret) {
> - of_node_put(of_chan);
> - of_node_put(of_channels);
> - return -EINVAL;
> - }
> - }
> - of_node_put(of_channels);
> + ret = axi_dmac_parse_dt(&pdev->dev, dmac);
> + if (ret < 0)
this need to jump to err_clk_disable
> + return ret;
>
> pdev->dev.dma_parms = &dmac->dma_parms;
> dma_set_max_seg_size(&pdev->dev, UINT_MAX);
> --
> 2.17.1
--
~Vinod
next prev parent reply other threads:[~2020-08-25 11:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-19 7:16 [PATCH 1/5] dmaengine: axi-dmac: move version read in probe Alexandru Ardelean
2020-08-19 7:16 ` [PATCH 2/5] dmaengine: axi-dmac: move clock enable earlier Alexandru Ardelean
2020-08-25 11:24 ` Vinod Koul
2020-08-25 12:34 ` Alexandru Ardelean
2020-08-19 7:16 ` [PATCH 3/5] dmaengine: axi-dmac: wrap entire dt parse in a function Alexandru Ardelean
2020-08-25 11:25 ` Vinod Koul [this message]
2020-08-19 7:16 ` [PATCH 4/5] dmaengine: axi-dmac: wrap channel parameter adjust into function Alexandru Ardelean
2020-08-19 7:16 ` [PATCH 5/5] dmaengine: axi-dmac: add support for reading bus attributes from registers Alexandru Ardelean
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=20200825112517.GP2639@vkoul-mobl \
--to=vkoul@kernel.org \
--cc=alexandru.ardelean@analog.com \
--cc=ardeleanalex@gmail.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.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).