* [PATCH v2] net: dsa: sja1105: print info about probed chip only after everything was done.
@ 2019-11-26 9:30 Oleksij Rempel
2019-11-26 9:42 ` Vladimir Oltean
0 siblings, 1 reply; 2+ messages in thread
From: Oleksij Rempel @ 2019-11-26 9:30 UTC (permalink / raw)
To: mkl, Vladimir Oltean, Andrew Lunn, Vivien Didelot, Florian Fainelli
Cc: Oleksij Rempel, kernel, netdev, linux-kernel, david
Currently we will get "Probed switch chip" notification multiple times
if first probe failed by some reason. To avoid this confusing notifications move
dev_info to the end of probe.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/sja1105/sja1105_main.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index aa140662c7c2..34544b1c30dc 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -2191,8 +2191,6 @@ static int sja1105_probe(struct spi_device *spi)
return rc;
}
- dev_info(dev, "Probed switch chip: %s\n", priv->info->name);
-
ds = dsa_switch_alloc(dev, SJA1105_NUM_PORTS);
if (!ds)
return -ENOMEM;
@@ -2218,7 +2216,13 @@ static int sja1105_probe(struct spi_device *spi)
sja1105_tas_setup(ds);
- return dsa_register_switch(priv->ds);
+ rc = dsa_register_switch(priv->ds);
+ if (rc)
+ return rc;
+
+ dev_info(dev, "Probed switch chip: %s\n", priv->info->name);
+
+ return 0;
}
static int sja1105_remove(struct spi_device *spi)
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] net: dsa: sja1105: print info about probed chip only after everything was done.
2019-11-26 9:30 [PATCH v2] net: dsa: sja1105: print info about probed chip only after everything was done Oleksij Rempel
@ 2019-11-26 9:42 ` Vladimir Oltean
0 siblings, 0 replies; 2+ messages in thread
From: Vladimir Oltean @ 2019-11-26 9:42 UTC (permalink / raw)
To: Oleksij Rempel
Cc: mkl, Andrew Lunn, Vivien Didelot, Florian Fainelli, kernel,
netdev, lkml, david
Hi Oleksij,
On Tue, 26 Nov 2019 at 11:30, Oleksij Rempel <o.rempel@pengutronix.de> wrote:
>
> Currently we will get "Probed switch chip" notification multiple times
> if first probe failed by some reason. To avoid this confusing notifications move
> dev_info to the end of probe.
>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
The merge window just opened yesterday:
http://vger.kernel.org/~davem/net-next.html.
Come back in 2 weeks with this patch for net-next.
> drivers/net/dsa/sja1105/sja1105_main.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
> index aa140662c7c2..34544b1c30dc 100644
> --- a/drivers/net/dsa/sja1105/sja1105_main.c
> +++ b/drivers/net/dsa/sja1105/sja1105_main.c
> @@ -2191,8 +2191,6 @@ static int sja1105_probe(struct spi_device *spi)
> return rc;
> }
>
> - dev_info(dev, "Probed switch chip: %s\n", priv->info->name);
> -
> ds = dsa_switch_alloc(dev, SJA1105_NUM_PORTS);
> if (!ds)
> return -ENOMEM;
> @@ -2218,7 +2216,13 @@ static int sja1105_probe(struct spi_device *spi)
>
> sja1105_tas_setup(ds);
>
> - return dsa_register_switch(priv->ds);
> + rc = dsa_register_switch(priv->ds);
> + if (rc)
> + return rc;
> +
> + dev_info(dev, "Probed switch chip: %s\n", priv->info->name);
> +
> + return 0;
> }
>
> static int sja1105_remove(struct spi_device *spi)
> --
> 2.24.0
>
Thanks,
-Vladimir
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-26 9:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-26 9:30 [PATCH v2] net: dsa: sja1105: print info about probed chip only after everything was done Oleksij Rempel
2019-11-26 9:42 ` Vladimir Oltean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).