openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: dsa: Move ports assignment closer to error checking 

Move the assignment of ports in _dsa_register_switch() closer to where
it is checked, no functional change. Re-order declarations to be
preserve the inverted christmas tree style.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-01-26 10:45:54 -08:00 committed by David S. Miller
parent 3512a8e95e
commit bc1727d242
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/dsa/dsa2.c
View File

@ -586,8 +586,8 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,
static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev) static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
{ {
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct device_node *ports = dsa_get_ports(ds, np);
struct dsa_switch_tree *dst; struct dsa_switch_tree *dst;
struct device_node *ports;
u32 tree, index; u32 tree, index;
int i, err; int i, err;
@ -595,6 +595,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
if (err) if (err)
return err; return err;
ports = dsa_get_ports(ds, np);
if (IS_ERR(ports)) if (IS_ERR(ports))
return PTR_ERR(ports); return PTR_ERR(ports);