From: Markus Pargmann <mpa@pengutronix.de>
To: "David S. Miller" <davem@davemloft.net>
Cc: Florian Fainelli <florian@openwrt.org>,
Mugunthan V N <mugunthanvnm@ti.com>,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
kernel@pengutronix.de, Markus Pargmann <mpa@pengutronix.de>
Subject: [PATCH 1/2] net: ethernet: cpsw: Search childs for slave nodes
Date: Fri, 4 Oct 2013 14:44:39 +0200 [thread overview]
Message-ID: <1380890680-30941-1-git-send-email-mpa@pengutronix.de> (raw)
The current implementation searches the whole DT for nodes named
"slave".
This patch changes it to search only child nodes for slaves.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/net/ethernet/ti/cpsw.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 79974e3..5df50a9 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1782,7 +1782,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
if (ret)
pr_warn("Doesn't have any child node\n");
- for_each_node_by_name(slave_node, "slave") {
+ for_each_child_of_node(node, slave_node) {
struct cpsw_slave_data *slave_data = data->slave_data + i;
const void *mac_addr = NULL;
u32 phyid;
@@ -1791,6 +1791,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
struct device_node *mdio_node;
struct platform_device *mdio;
+ /* This is no slave child node, continue */
+ if (strcmp(slave_node->name, "slave"))
+ continue;
+
parp = of_get_property(slave_node, "phy_id", &lenp);
if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
pr_err("Missing slave[%d] phy_id property\n", i);
--
1.8.4.rc3
next reply other threads:[~2013-10-04 12:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 12:44 Markus Pargmann [this message]
2013-10-04 12:44 ` [PATCH 2/2] net/ethernet: cpsw: DT read bool dual_emac Markus Pargmann
2013-10-04 13:28 ` Mugunthan V N
2013-10-04 15:24 ` Peter Korsgaard
2013-10-07 19:19 ` David Miller
2013-10-04 13:27 ` [PATCH 1/2] net: ethernet: cpsw: Search childs for slave nodes Mugunthan V N
2013-10-04 15:24 ` Peter Korsgaard
2013-10-07 19:19 ` David Miller
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=1380890680-30941-1-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=davem@davemloft.net \
--cc=florian@openwrt.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mugunthanvnm@ti.com \
--cc=netdev@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).