From: Florian Fainelli <f.fainelli@gmail•com>
To: netdev@vger•kernel.org
Cc: Florian Fainelli <f.fainelli@gmail•com>,
Jason Cooper <jason@lakedaemon•net>, Andrew Lunn <andrew@lunn•ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>,
Gregory Clement <gregory.clement@free-electrons•com>,
Russell King <linux@armlinux•org.uk>,
Vivien Didelot <vivien.didelot@savoirfairelinux•com>,
"David S. Miller" <davem@davemloft•net>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
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 v4 04/10] net: dsa: Move ports assignment closer to error checking
Date: Tue, 17 Jan 2017 15:21:46 -0800 [thread overview]
Message-ID: <20170117232152.1661-5-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170117232152.1661-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
next prev parent reply other threads:[~2017-01-17 23:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 23:21 [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 01/10] net: dsa: Pass device pointer to dsa_register_switch Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 02/10] net: dsa: Make most functions take a dsa_port argument Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 03/10] net: dsa: Suffix function manipulating device_node with _dn Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli [this message]
2017-01-17 23:21 ` [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name() Florian Fainelli
2017-01-17 23:34 ` Andy Shevchenko
2017-01-17 23:43 ` Florian Fainelli
2017-01-18 0:00 ` Andy Shevchenko
2017-01-18 0:04 ` Florian Fainelli
2017-01-18 0:07 ` Andy Shevchenko
2017-01-18 0:13 ` Florian Fainelli
2017-01-18 7:06 ` Greg Kroah-Hartman
2017-01-17 23:21 ` [PATCH net-next v4 06/10] net: dsa: Migrate to device_find_in_class_name() Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 07/10] net: Relocate dev_to_net_device() into net/core/dev.c Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 08/10] net: dsa: Add support for platform data Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 09/10] net: phy: Allow pre-declaration of MDIO devices Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 10/10] ARM: orion: Register DSA switch as a MDIO device Florian Fainelli
2017-01-18 21:50 ` [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 David Miller
2017-01-18 22:06 ` Florian Fainelli
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=20170117232152.1661-5-f.fainelli@gmail.com \
--to=f.fainelli@gmail$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=gregory.clement@free-electrons$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sebastian.hesselbarth@gmail$(echo .)com \
--cc=vivien.didelot@savoirfairelinux$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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