[PATCH net-next 1/9] net: dsa: Prepare to support legacy DT binding
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2016-06-04 00:05:42
Subsystem:
networking [dsa], networking [general], the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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