From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, andrew@lunn.ch,
vivien.didelot@savoirfairelinux.com, john@phrozen.org,
Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 1/9] net: dsa: Prepare to support legacy DT binding
Date: Fri, 3 Jun 2016 17:05:21 -0700 [thread overview]
Message-ID: <1464998733-10405-2-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1464998733-10405-1-git-send-email-f.fainelli@gmail.com>
In preparation for supporting the legacy DT binding, call
dsa_get_ports() early on to allow two different parsing code paths to be
called.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/dsa2.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 4e5051bed643..b5640d8ffbae 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -552,7 +552,7 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,
return ports;
}
-static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
+static int __dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
{
struct device_node *ports = dsa_get_ports(ds, np);
struct dsa_switch_tree *dst;
@@ -622,6 +622,16 @@ out:
return err;
}
+static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
+{
+ struct device_node *ports = dsa_get_ports(ds, np);
+
+ if (IS_ERR(ports))
+ return PTR_ERR(ports);
+
+ return __dsa_register_switch(ds, np);
+}
+
int dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
{
int err;
--
2.7.4
next prev parent reply other threads:[~2016-06-04 0:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-04 0:05 [PATCH net-next 0/9] net: dsa: misc improvements Florian Fainelli
2016-06-04 0:05 ` Florian Fainelli [this message]
2016-06-04 0:05 ` [PATCH net-next] net: dsa: Provide CPU port statistics to master netdev Florian Fainelli
2016-06-04 0:06 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next] net: dsa: bcm_sf2: Implement FDB operations Florian Fainelli
2016-06-04 0:06 ` Florian Fainelli
2016-06-06 13:30 ` Vivien Didelot
2016-06-04 0:05 ` [PATCH net-next 2/9] net: dsa: Add support for parsing the old binding Florian Fainelli
2016-06-04 19:44 ` Andrew Lunn
2016-06-04 20:00 ` Andrew Lunn
2016-06-05 22:42 ` Florian Fainelli
2016-06-06 3:19 ` Andrew Lunn
2016-06-06 20:13 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 3/9] net: dsa: Provide unique DSA slave MII bus names Florian Fainelli
2016-06-04 20:00 ` Andrew Lunn
2016-06-06 13:36 ` Vivien Didelot
2016-06-04 0:05 ` [PATCH net-next 4/9] net: dsa: Initialize ds->enabled_port_mask and ds->phys_mii_mask Florian Fainelli
2016-06-04 20:29 ` Andrew Lunn
2016-06-05 22:38 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 5/9] net: dsa: Export suspend/resume functions Florian Fainelli
2016-06-04 20:30 ` Andrew Lunn
2016-06-06 13:40 ` Vivien Didelot
2016-06-04 0:05 ` [PATCH net-next 6/9] net: dsa: Add initialization helper for CPU port ethtool_ops Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 6/7] net: dsa: bcm_sf2: Make it a real platform device driver Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 7/9] net: dsa: Initialize CPU port ethtool ops per tree Florian Fainelli
2016-06-04 20:38 ` Andrew Lunn
2016-06-05 22:29 ` Florian Fainelli
2016-06-06 2:40 ` Andrew Lunn
2016-06-04 0:05 ` [PATCH net-next 7/7] net: dsa: bcm_sf2: Register our slave MDIO bus Florian Fainelli
2016-06-04 20:49 ` Andrew Lunn
2016-06-04 0:05 ` [PATCH net-next 8/9] net: dsa: bcm_sf2: Make it a real platform device driver Florian Fainelli
2016-06-04 20:55 ` Andrew Lunn
2016-06-05 22:30 ` Florian Fainelli
2016-06-04 0:05 ` [PATCH net-next 9/9] net: dsa: bcm_sf2: Register our slave MDIO bus Florian Fainelli
2016-06-04 0:10 ` [PATCH net-next 0/9] net: dsa: misc improvements Florian Fainelli
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=1464998733-10405-2-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=john@phrozen.org \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@savoirfairelinux.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).