From patchwork Tue Jan 10 20:12:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 713411 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tyjsz5dn9z9t1d for ; Wed, 11 Jan 2017 07:14:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VUUc0itp"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162697AbdAJUOH (ORCPT ); Tue, 10 Jan 2017 15:14:07 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36791 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967040AbdAJUNU (ORCPT ); Tue, 10 Jan 2017 15:13:20 -0500 Received: by mail-pf0-f195.google.com with SMTP id b22so13949555pfd.3; Tue, 10 Jan 2017 12:13:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wZM+I3uajIXFmmXOgEUpIaIfNqgGWya4VvQL4oMytms=; b=VUUc0itpVubbG7cDfwgmrz7Way8l24NcN+saqdF9VfpxeSEPY2TNrObncdywtBBHoz dppam5rpwyeccFLSiJ55mHmoB0vW8YVHdzxMkiRAvr+ryzDN6ZQo7cU26p4fYoAIp0fh aRquBcNe1IiM5pgLk1GDxk2VzwSagHXZdCSNd5JrUs56KIPeZTPzUiOUKTk6i3flOSwR izEtIueCJBdCHjSdd9bKxKzFQdmcx50SlA+hHqD8xoSjf9PzTd1GDz/WdE1BoCobukAg 4OylhhOwexYaK4stnFpMrOe5Rgw92xNdsAb6e6NzEh63V6hpiWwES8VClDEf2v0daDNT BM9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wZM+I3uajIXFmmXOgEUpIaIfNqgGWya4VvQL4oMytms=; b=d9VW5XR3hit/ndx4l9j8nr/Ve1jjP7iUqQ7UkXFAsaZTzUvnyKsS+YbCkvb2UgBC2z OfM8GTLN30BcY52dYEVLGOmKXtqyLnrIf6SiPTb7I2wjqLprBlj0HImfQBRuIgS0i9Zq ywpYxrJZrHXuUpKaRQYCGFqqdLq+hM+JeUcHJoGDkB3W9qmk9vwu5NhqxHDjMURVSgyv 2qYvpMzM6ygdrkWrI+x7pAyPX7xcUMWFUFA1bFSact0qGnXfSK6wsvpZOZRyR6LsFkJf 4Y0t0phkYkU4k6uyowq65ozsxvIn8j85AI4kBGePIYDziGg8CF8VnIiiKQllM8LFYJOx +iFg== X-Gm-Message-State: AIkVDXIU4t+bR1LuZDF+ut0F83kEXNtH4SYLarDrHSHvov8mrUFfN2+vUvium/K0qQoU5w== X-Received: by 10.98.0.143 with SMTP id 137mr5932214pfa.183.1484079194322; Tue, 10 Jan 2017 12:13:14 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id e127sm7741037pfh.89.2017.01.10.12.13.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2017 12:13:13 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Russell King , Vivien Didelot , "David S. Miller" , Philippe Reynes , Martin Schwidefsky , Greg Kroah-Hartman , Stuart Yoder , Ingo Tuchscherer , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Marvell Dove/MV78xx0/Orion SOC support), linux-kernel@vger.kernel.org (open list) 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> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170110201235.21771-1-f.fainelli@gmail.com> References: <20170110201235.21771-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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);