Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1238895 > unrolled thread

[PATCH v2 5/5] net: dsa: exit probe if no switch were found

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 5/5] net: dsa: exit probe if no switch were found Neil Armstrong <narmstrong@baylibre.com> - 2015-10-03 16:30 +0200
    Re: [PATCH v2 5/5] net: dsa: exit probe if no switch were found Florian Fainelli <f.fainelli@gmail.com> - 2015-10-03 22:30 +0200
      Re: [PATCH v2 5/5] net: dsa: exit probe if no switch were found Neil Armstrong <narmstrong@baylibre.com> - 2015-10-06 09:30 +0200

#1238895 — [PATCH v2 5/5] net: dsa: exit probe if no switch were found

If no switch were found in dsa_setup_dst, return -ENODEV and
exit the dsa_probe cleanly.

Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 net/dsa/dsa.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index dd171ff..9c521b7 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -836,10 +836,11 @@ static inline void dsa_of_remove(struct device *dev)
 }
 #endif

-static void dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
+static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
 			  struct device *parent, struct dsa_platform_data *pd)
 {
 	int i;
+	unsigned configured = 0;

 	dst->pd = pd;
 	dst->master_netdev = dev;
@@ -859,9 +860,17 @@ static void dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
 		dst->ds[i] = ds;
 		if (ds->drv->poll_link != NULL)
 			dst->link_poll_needed = 1;
+
+		++configured;
 	}

 	/*
+	 * If no switch was found, exit cleanly
+	 */
+	if (!configured)
+		return -EPROBE_DEFER;
+
+	/*
 	 * If we use a tagging format that doesn't have an ethertype
 	 * field, make sure that all packets from this point on get
 	 * sent to the tag format's receive function.
@@ -877,6 +886,8 @@ static void dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
 		dst->link_poll_timer.expires = round_jiffies(jiffies + HZ);
 		add_timer(&dst->link_poll_timer);
 	}
+
+	return 0;
 }

 static int dsa_probe(struct platform_device *pdev)
@@ -926,9 +937,9 @@ static int dsa_probe(struct platform_device *pdev)

 	platform_set_drvdata(pdev, dst);

-	dsa_setup_dst(dst, dev, &pdev->dev, pd);
-
-	return 0;
+	ret = dsa_setup_dst(dst, dev, &pdev->dev, pd);
+	if (!ret)
+		return 0;

 out:
 	dsa_of_remove(&pdev->dev);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1238987

Le 03/10/2015 07:26, Neil Armstrong a écrit :
> If no switch were found in dsa_setup_dst, return -ENODEV and
> exit the dsa_probe cleanly.
> 
> Tested-by: Andrew Lunn <andrew@lunn.ch>
> Tested-by: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---

[snip]

>  static int dsa_probe(struct platform_device *pdev)
> @@ -926,9 +937,9 @@ static int dsa_probe(struct platform_device *pdev)
> 
>  	platform_set_drvdata(pdev, dst);
> 
> -	dsa_setup_dst(dst, dev, &pdev->dev, pd);
> -
> -	return 0;
> +	ret = dsa_setup_dst(dst, dev, &pdev->dev, pd);
> +	if (!ret)
> +		return 0;

That logic is a little weird, I would just go with something like this:

ret = dsa_setup_dst(ds, dev, &pdev->dev, pd);
if (ret)
	goto out;

return 0;
-- 
Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1240204

On 10/03/2015 09:27 PM, Florian Fainelli wrote:
> Le 03/10/2015 07:26, Neil Armstrong a écrit :
>> If no switch were found in dsa_setup_dst, return -ENODEV and
>> exit the dsa_probe cleanly.
>>
>> Tested-by: Andrew Lunn <andrew@lunn.ch>
>> Tested-by: Florian Fainelli <f.fainelli@gmail.com>
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
> 
> [snip]
> 
>>  static int dsa_probe(struct platform_device *pdev)
>> @@ -926,9 +937,9 @@ static int dsa_probe(struct platform_device *pdev)
>>
>>  	platform_set_drvdata(pdev, dst);
>>
>> -	dsa_setup_dst(dst, dev, &pdev->dev, pd);
>> -
>> -	return 0;
>> +	ret = dsa_setup_dst(dst, dev, &pdev->dev, pd);
>> +	if (!ret)
>> +		return 0;
> 
> That logic is a little weird, I would just go with something like this:
> 
> ret = dsa_setup_dst(ds, dev, &pdev->dev, pd);
> if (ret)
> 	goto out;
> 
> return 0;
> 
Yes you are right, the goto out is needed to clean up the of_probe resources.

I will send a v3 with this fixed.

Neil
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web