From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH net-next 4/8] net: dsa: Move ports assignment closer to error checking Date: Tue, 10 Jan 2017 12:12:31 -0800 Message-ID: <20170110201235.21771-5-f.fainelli@gmail.com> References: <20170110201235.21771-1-f.fainelli@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Andrew Lunn , Florian Fainelli , Ingo Tuchscherer , Jason Cooper , Vivien Didelot , Greg Kroah-Hartman , open list , Russell King , Stuart Yoder , Martin Schwidefsky , Gregory Clement , Philippe Reynes , "David S. Miller" , "moderated list:ARM/Marvell Dove/MV78xx0/Orion SOC support" , Sebastian Hesselbarth To: netdev@vger.kernel.org Return-path: In-Reply-To: <20170110201235.21771-1-f.fainelli@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: netdev.vger.kernel.org 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 --- 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 9089b3b1d7f5..ddee540d9a83 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -600,8 +600,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; @@ -609,6 +609,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