From: Joerg Roedel <joro@8bytes.org>
To: Rob Herring <robh+dt@kernel.org>, grant.likely@linaro.org
Cc: Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
jroedel@suse.de
Subject: [PATCH 3/6] of: Remove counting special case from __of_parse_phandle_with_args()
Date: Mon, 4 Apr 2016 17:49:19 +0200 [thread overview]
Message-ID: <1459784962-9808-4-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1459784962-9808-1-git-send-email-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
The index = -1 case in __of_parse_phandle_with_args() is
used to just return the number of phandles. That special
case needs extra handling, so move it to the place where it
is needed: of_count_phandle_with_args().
This allows to further simplify __of_parse_phandle_with_args()
later on.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Acked-by: Rob Herring <robh@kernel.org>
---
drivers/of/base.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 69286ec..fcff2b6 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1584,10 +1584,7 @@ static int __of_parse_phandle_with_args(const struct device_node *np,
* Unlock node before returning result; will be one of:
* -ENOENT : index is for empty phandle
* -EINVAL : parsing error on data
- * [1..n] : Number of phandle (count mode; when index = -1)
*/
- if (rc == -ENOENT && index < 0)
- rc = cur_index;
err:
if (it.node)
@@ -1723,8 +1720,20 @@ EXPORT_SYMBOL(of_parse_phandle_with_fixed_args);
int of_count_phandle_with_args(const struct device_node *np, const char *list_name,
const char *cells_name)
{
- return __of_parse_phandle_with_args(np, list_name, cells_name, 0, -1,
- NULL);
+ struct of_phandle_iterator it;
+ int rc, cur_index = 0;
+
+ rc = of_phandle_iterator_init(&it, np, list_name, cells_name, 0);
+ if (rc)
+ return rc;
+
+ while ((rc = of_phandle_iterator_next(&it)) == 0)
+ cur_index += 1;
+
+ if (rc != -ENOENT)
+ return rc;
+
+ return cur_index;
}
EXPORT_SYMBOL(of_count_phandle_with_args);
--
1.9.1
next prev parent reply other threads:[~2016-04-04 15:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-04 15:49 [PATCH 0/6 v2] of: Implement iterator for phandles Joerg Roedel
2016-04-04 15:49 ` [PATCH 1/6] of: Introduce struct of_phandle_iterator Joerg Roedel
2016-04-04 15:49 ` [PATCH 2/6] of: Move phandle walking to of_phandle_iterator_next() Joerg Roedel
2016-04-04 15:49 ` Joerg Roedel [this message]
2016-04-04 15:49 ` [PATCH 4/6] of: Introduce of_for_each_phandle() helper macro Joerg Roedel
2016-04-04 15:49 ` [PATCH 5/6] of: Introduce of_phandle_iterator_args() Joerg Roedel
2016-04-04 15:49 ` [PATCH 6/6] iommu/arm-smmu: Make use of phandle iterators in device-tree parsing Joerg Roedel
2016-04-14 17:16 ` Will Deacon
2016-04-19 22:30 ` [PATCH 0/6 v2] of: Implement iterator for phandles Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2016-03-22 17:58 [PATCH 0/6] " Joerg Roedel
2016-03-22 17:58 ` [PATCH 3/6] of: Remove counting special case from __of_parse_phandle_with_args() Joerg Roedel
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=1459784962-9808-4-git-send-email-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=will.deacon@arm.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).