From: Andres Salomon <dilinger@queued.net>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: devicetree-discuss@lists.ozlabs.org,
Daniel Drake <dsd@laptop.org>,
linux-kernel@vger.kernel.org, davem@davemloft.net,
sparclinux@vger.kernel.org
Subject: [PATCH 2/4] of/promtree: switch to building the DT using of_attach_node
Date: Thu, 17 Mar 2011 17:32:34 -0700 [thread overview]
Message-ID: <1300408356-15253-3-git-send-email-dilinger@queued.net> (raw)
In-Reply-To: <1300408356-15253-1-git-send-email-dilinger@queued.net>
Use common functions (of_attach_node) to build the device tree. This
allows us to drop a bit of code, and improves readability of the
tree building code.
Note that this changes what gets passed to the of_pdt_build_more()
hook. The only user of this hook is sparc's leon_kernel.c, which ends
up using it to call prom_amba_init. However, prom_amba_init isn't
actually set in the kernel, so I can't tell whether this actually breaks
behavior or not.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/of/pdt.c | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c
index 4d87b5d..f3ddc2d 100644
--- a/drivers/of/pdt.c
+++ b/drivers/of/pdt.c
@@ -193,11 +193,8 @@ static struct device_node * __init of_pdt_create_node(phandle node,
return dp;
}
-static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
- phandle node,
- struct device_node ***nextp)
+static void __init of_pdt_build_tree(struct device_node *parent, phandle node)
{
- struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;
while (1) {
@@ -205,34 +202,20 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
if (!dp)
break;
- if (prev_sibling)
- prev_sibling->sibling = dp;
-
- if (!ret)
- ret = dp;
- prev_sibling = dp;
-
- *(*nextp) = dp;
- *nextp = &dp->allnext;
-
dp->full_name = of_pdt_build_full_name(dp);
+ of_attach_node(dp);
- dp->child = of_pdt_build_tree(dp,
- of_pdt_prom_ops->getchild(node), nextp);
+ of_pdt_build_tree(dp, of_pdt_prom_ops->getchild(node));
if (of_pdt_build_more)
- of_pdt_build_more(dp, nextp);
+ of_pdt_build_more(dp, NULL);
node = of_pdt_prom_ops->getsibling(node);
}
-
- return ret;
}
void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops)
{
- struct device_node **nextp;
-
BUG_ON(!ops);
of_pdt_prom_ops = ops;
@@ -242,7 +225,6 @@ void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops)
#endif
allnodes->full_name = "/";
- nextp = &allnodes->allnext;
- allnodes->child = of_pdt_build_tree(allnodes,
- of_pdt_prom_ops->getchild(allnodes->phandle), &nextp);
+ of_pdt_build_tree(allnodes,
+ of_pdt_prom_ops->getchild(allnodes->phandle));
}
--
1.7.2.3
next prev parent reply other threads:[~2011-03-18 0:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-18 0:32 [PATCH 0/4] switch DT creation to using of_attach_node (v2) Andres Salomon
2011-03-18 0:32 ` [PATCH 1/4] of: rework of_attach_node, removing CONFIG_OF_DYNAMIC Andres Salomon
2011-04-08 16:52 ` Grant Likely
2011-03-18 0:32 ` Andres Salomon [this message]
2011-03-18 0:32 ` [PATCH 3/4] of/flattree: minor cleanups Andres Salomon
2011-03-23 20:35 ` Grant Likely
2011-03-18 0:32 ` [PATCH 4/4] of/flattree: use of_attach_node to build tree Andres Salomon
2011-03-18 5:45 ` [PATCH 0/4] switch DT creation to using of_attach_node (v2) Grant Likely
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=1300408356-15253-3-git-send-email-dilinger@queued.net \
--to=dilinger@queued.net \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dsd@laptop.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@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).