net: dsa: microchip: add dev_err_probe in probe functions

Probe functions uses normal dev_err() to check error conditions
and print messages. Replace dev_err() with dev_err_probe() to
have more standardized format and error logging.

Signed-off-by: Rakesh Sankaranarayanan <rakesh.sankaranarayanan@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c
index ddb40838181efdc30db1402a5b8f71e459707656..2f4623f3bd852a81253375175af18efb1ef7e8a3 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8863_smi.c
+++ b/drivers/net/dsa/microchip/ksz8863_smi.c
@@ -152,11 +152,10 @@ static int ksz8863_smi_probe(struct mdio_device *mdiodev)
                                                  &regmap_smi[i], dev,
                                                  &rc);
                if (IS_ERR(dev->regmap[i])) {
-                       ret = PTR_ERR(dev->regmap[i]);
-                       dev_err(&mdiodev->dev,
-                               "Failed to initialize regmap%i: %d\n",
-                               ksz8863_regmap_config[i].val_bits, ret);
-                       return ret;
+                       return dev_err_probe(&mdiodev->dev,
+                                            PTR_ERR(dev->regmap[i]),
+                                            "Failed to initialize regmap%i\n",
+                                            ksz8863_regmap_config[i].val_bits);
                }
        }
 

diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c
index caa9acf1495cd900f3c498bc2384ce1b0a935080..db4aec0a51dc028d08aa18715ecd41ec93a09298 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@ -30,11 +30,9 @@ static int ksz9477_i2c_probe(struct i2c_client *i2c,
                rc.lock_arg = &dev->regmap_mutex;
                dev->regmap[i] = devm_regmap_init_i2c(i2c, &rc);
                if (IS_ERR(dev->regmap[i])) {
-                       ret = PTR_ERR(dev->regmap[i]);
-                       dev_err(&i2c->dev,
-                               "Failed to initialize regmap%i: %d\n",
-                               ksz9477_regmap_config[i].val_bits, ret);
-                       return ret;
+                       return dev_err_probe(&i2c->dev, PTR_ERR(dev->regmap[i]),
+                                            "Failed to initialize regmap%i\n",
+                                            ksz9477_regmap_config[i].val_bits);
                }
        }
 

diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c
index 4f2186779082ad3677c62c419e3f0ceecdf95a2a..96c52e8fb51b6c858e413ffac870337a07c1ded9 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_spi.c
+++ b/drivers/net/dsa/microchip/ksz_spi.c
@@ -71,11 +71,9 @@ static int ksz_spi_probe(struct spi_device *spi)
                dev->regmap[i] = devm_regmap_init_spi(spi, &rc);
 
                if (IS_ERR(dev->regmap[i])) {
-                       ret = PTR_ERR(dev->regmap[i]);
-                       dev_err(&spi->dev,
-                               "Failed to initialize regmap%i: %d\n",
-                               regmap_config[i].val_bits, ret);
-                       return ret;
+                       return dev_err_probe(&spi->dev, PTR_ERR(dev->regmap[i]),
+                                            "Failed to initialize regmap%i\n",
+                                            regmap_config[i].val_bits);
                }
        }