Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1561117

[PATCH net-next v4 04/10] net: dsa: Move ports assignment closer to error checking

Show all headers | View raw

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>
---
 net/dsa/dsa2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 04ab62251fe3..cd91070b5467 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -587,8 +587,8 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,
 static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
 {
 	struct device_node *np = dev->of_node;
-	struct device_node *ports = dsa_get_ports(ds, np);
 	struct dsa_switch_tree *dst;
+	struct device_node *ports;
 	u32 tree, index;
 	int i, err;
 
@@ -596,6 +596,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
 	if (err)
 		return err;
 
+	ports = dsa_get_ports(ds, np);
 	if (IS_ERR(ports))
 		return PTR_ERR(ports);
 
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 00:30 +0100
  [PATCH net-next v4 04/10] net: dsa: Move ports assignment closer to error checking Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 00:40 +0100
  [PATCH net-next v4 07/10] net: Relocate dev_to_net_device() into net/core/dev.c Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 00:40 +0100
  [PATCH net-next v4 06/10] net: dsa: Migrate to device_find_in_class_name() Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 00:40 +0100
  [PATCH net-next v4 03/10] net: dsa: Suffix function manipulating device_node with _dn Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 00:40 +0100
  [PATCH net-next v4 02/10] net: dsa: Make most functions take a dsa_port argument Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 00:40 +0100
  Re: [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 David Miller <davem@davemloft.net> - 2017-01-18 23:00 +0100
    Re: [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 Florian Fainelli <f.fainelli@gmail.com> - 2017-01-18 23:10 +0100

csiph-web