From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756636AbbJAP1n (ORCPT ); Thu, 1 Oct 2015 11:27:43 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:36292 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756374AbbJAP1f (ORCPT ); Thu, 1 Oct 2015 11:27:35 -0400 Subject: Re: [RFC PATCH 3/3] net: dsa: exit probe if no switch were found To: "David S. Miller" , Jesper Dangaard Brouer , netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <560B9B7C.9080406@baylibre.com> From: Neil Armstrong Organization: Baylibre Message-ID: <560D50E4.6040400@baylibre.com> Date: Thu, 1 Oct 2015 17:27:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <560B9B7C.9080406@baylibre.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/30/2015 10:21 AM, Neil Armstrong wrote: > If no switch were found in dsa_setup_dst, return -ENODEV and > exit the dsa_probe cleanly. > > Signed-off-by: Neil Armstrong > --- > 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 0c104af..6ae1ab9 100644 > --- a/net/dsa/dsa.c > +++ b/net/dsa/dsa.c > @@ -844,10 +844,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; > @@ -867,9 +868,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 -ENODEV; > + > + /* > * 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. > @@ -885,6 +894,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) > @@ -934,9 +945,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); > Couldn't we use the probe defer mechanism here ? (until complete rework is done) How could we re-probe after a register_switch_driver ? Neil