[PATCH net-next] net: dsa: return directly from dsa_to_port

[PATCH net-next] net: dsa: return directly from dsa_to_port

[Vivien Didelot]

Return directly from within the loop as soon as the port is found,
otherwise we won't return NULL if the end of the list is reached.

Fixes: b96ddf254b09 ("net: dsa: use ports list in dsa_to_port")
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
---
 include/net/dsa.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 73900b89c1b9..14357b576b13 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -286,13 +286,13 @@ struct dsa_switch {
 static inline struct dsa_port *dsa_to_port(struct dsa_switch *ds, int p)
 {
 	struct dsa_switch_tree *dst = ds->dst;
-	struct dsa_port *dp = NULL;
+	struct dsa_port *dp;
 
 	list_for_each_entry(dp, &dst->ports, list)
 		if (dp->ds == ds && dp->index == p)
-			break;
+			return dp;
 
-	return dp;
+	return NULL;
 }
 
 static inline bool dsa_is_unused_port(struct dsa_switch *ds, int p)
-- 
2.23.0

Re: [PATCH net-next] net: dsa: return directly from dsa_to_port

[Andrew Lunn]

On Fri, Oct 25, 2019 at 02:48:53PM -0400, Vivien Didelot wrote:
> Return directly from within the loop as soon as the port is found,
> otherwise we won't return NULL if the end of the list is reached.
> 
> Fixes: b96ddf254b09 ("net: dsa: use ports list in dsa_to_port")
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

Re: [PATCH net-next] net: dsa: return directly from dsa_to_port

[Florian Fainelli]

On 10/25/19 11:48 AM, Vivien Didelot wrote:
> Return directly from within the loop as soon as the port is found,
> otherwise we won't return NULL if the end of the list is reached.
> 
> Fixes: b96ddf254b09 ("net: dsa: use ports list in dsa_to_port")
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

My bad for suggesting a broken way of doing this, so thanks for fixing it ;)
-- 
Florian

Re: [PATCH net-next] net: dsa: return directly from dsa_to_port

[David Miller]

From: Vivien Didelot <vivien.didelot@gmail.com>
Date: Fri, 25 Oct 2019 14:48:53 -0400

> Return directly from within the loop as soon as the port is found,
> otherwise we won't return NULL if the end of the list is reached.
> 
> Fixes: b96ddf254b09 ("net: dsa: use ports list in dsa_to_port")
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Applied, thanks.