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 <andrew@lunn.ch>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Jason Cooper <jason@lakedaemon.net>,
	Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
	gregkh@linuxfoundation.org, Russell King <linux@armlinux.org.uk>,
	open list <linux-kernel@vger.kernel.org>,
	Gregory Clement <gregory.clement@free-electrons.com>,
	"David S. Miller" <davem@davemloft.net>,
	"moderated list:ARM SUB-ARCHITECTURES"
	<linux-arm-kernel@lists.infradead.org>,
	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: [PATCH net-next v3 04/10] net: dsa: Move ports assignment closer to error checking
Date: Sat, 14 Jan 2017 13:47:07 -0800	[thread overview]
Message-ID: <20170114214713.28109-5-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170114214713.28109-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 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

  parent reply	other threads:[~2017-01-14 21:47 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-14 21:47 [PATCH net-next v3 00/10] net: dsa: Support for pdata in dsa2 Florian Fainelli
2017-01-14 21:47 ` [PATCH net-next v3 01/10] net: dsa: Pass device pointer to dsa_register_switch Florian Fainelli
2017-01-14 21:47 ` [PATCH net-next v3 02/10] net: dsa: Make most functions take a dsa_port argument Florian Fainelli
2017-01-14 21:47 ` [PATCH net-next v3 03/10] net: dsa: Suffix function manipulating device_node with _dn Florian Fainelli
2017-01-14 21:47 ` Florian Fainelli [this message]
2017-01-15 10:17   ` [PATCH net-next v3 04/10] net: dsa: Move ports assignment closer to error checking Sergei Shtylyov
2017-01-14 21:47 ` [PATCH net-next v3 05/10] drivers: base: Add device_find_class() Florian Fainelli
2017-01-15 11:04   ` Greg KH
2017-01-15 17:39     ` Florian Fainelli
2017-01-14 21:47 ` [PATCH net-next v3 06/10] net: dsa: Migrate to device_find_class() Florian Fainelli
2017-01-15 11:06   ` Greg KH
2017-01-15 17:27     ` Florian Fainelli
2017-01-15 17:39       ` Greg KH
2017-01-15 17:52         ` Florian Fainelli
2017-01-15 19:16           ` Andrew Lunn
2017-01-16 20:01             ` Florian Fainelli
2017-01-18  7:06               ` Greg KH
2017-01-19 14:28               ` Greg KH
2017-01-19 14:53                 ` Andrew Lunn
2017-01-19 16:30                   ` Greg KH
2017-01-19 16:35                     ` Russell King - ARM Linux
2017-01-19 16:51                   ` Russell King - ARM Linux
2017-01-19 18:12                     ` Florian Fainelli
2017-01-24 18:59                       ` Florian Fainelli
2017-01-25 21:25                         ` Greg KH
2017-01-30 22:46                           ` Florian Fainelli
2017-02-10 13:02                     ` Greg KH
2017-02-10 18:30                       ` Florian Fainelli
2017-02-12 12:56                         ` Greg KH
2017-01-14 21:47 ` [PATCH net-next v3 07/10] net: Relocate dev_to_net_device() into core Florian Fainelli
2017-01-15 11:07   ` Greg KH
2017-01-15 17:20     ` Florian Fainelli
2017-01-15 17:40       ` Greg KH
2017-01-14 21:47 ` [PATCH net-next v3 08/10] net: dsa: Add support for platform data Florian Fainelli
2017-01-14 21:47 ` [PATCH net-next v3 09/10] net: phy: Allow pre-declaration of MDIO devices Florian Fainelli
2017-01-14 21:47 ` [PATCH net-next v3 10/10] ARM: orion: Register DSA switch as a MDIO device Florian Fainelli
2017-01-15 11:08 ` [PATCH net-next v3 00/10] net: dsa: Support for pdata in dsa2 Greg KH
2017-01-15 17:40   ` Florian Fainelli
2017-01-15 17:49     ` Greg KH

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=20170114214713.28109-5-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=gregory.clement@free-electrons.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=netdev@vger.kernel.org \
    --cc=sebastian.hesselbarth@gmail.com \
    --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).