[PATCH v2] net: dsa: sja1105: print info about probed chip only after everything was done.

From: Oleksij Rempel
Date: Tue Nov 26 2019 - 04:30:18 EST


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@xxxxxxx>
Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
---
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