netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: andrew@lunn.ch, vivien.didelot@savoirfairelinux.com,
	davem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v2 4/4] net: dsa: Move ports assignment closer to error checking
Date: Thu, 26 Jan 2017 10:45:54 -0800	[thread overview]
Message-ID: <20170126184554.1325-5-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170126184554.1325-1-f.fainelli@gmail.com>

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 4c11619a818b..75f5d1f8554b 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -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)
 {
 	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;
 
@@ -595,6 +595,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

  parent reply	other threads:[~2017-01-26 18:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-26 18:45 [PATCH net-next v2 0/4] net: dsa: Preparatory patches Florian Fainelli
2017-01-26 18:45 ` [PATCH net-next v2 1/4] net: dsa: Pass device pointer to dsa_register_switch Florian Fainelli
2017-01-26 18:45 ` [PATCH net-next v2 2/4] net: dsa: Make most functions take a dsa_port argument Florian Fainelli
2017-01-26 18:45 ` [PATCH net-next v2 3/4] net: dsa: Suffix function manipulating device_node with _dn Florian Fainelli
2017-01-26 18:45 ` Florian Fainelli [this message]
2017-01-26 20:44 ` [PATCH net-next v2 0/4] net: dsa: Preparatory patches David Miller
  -- strict thread matches above, loose matches on Subject: below --
2016-07-05 22:07 [PATCH net-next v2 0/4] net: dsa: Preparatory patches for pdata Florian Fainelli
2016-07-05 22:07 ` [PATCH net-next v2 4/4] net: dsa: Move ports assignment closer to error checking Florian Fainelli
2016-07-05 22:37   ` Andrew Lunn
2016-07-06 11:50   ` Sergei Shtylyov

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=20170126184554.1325-5-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --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).