can: mcp251x: mcp251x_can_probe(): use dev_err_probe()

The currently used combination of dev_err() plus return leaves a loud error
in dmesg even when the error is a deferred probe which gets resolved later.
For example a supply that has not been probed yet.

Use dev_err_probe() to improve the handling/display of errors.

Signed-off-by: Maud Spierings <maudspierings@gocontroll.com>
Link: https://patch.msgid.link/20251030-mcp_err-v1-1-eecf737823b7@gocontroll.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index 1e54e1a22702abf8f3fe74b7ab04b0b507a5f3e5..fa97adf25b734ab4a2886bf050f90b32b8886560 100644 (file)
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -1320,7 +1320,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
 
        clk = devm_clk_get_optional(&spi->dev, NULL);
        if (IS_ERR(clk))
-               return PTR_ERR(clk);
+               return dev_err_probe(&spi->dev, PTR_ERR(clk), "Cannot get clock\n");
 
        freq = clk_get_rate(clk);
        if (freq == 0)
@@ -1328,7 +1328,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
 
        /* Sanity check */
        if (freq < 1000000 || freq > 25000000)
-               return -ERANGE;
+               return dev_err_probe(&spi->dev, -ERANGE, "clock frequency out of range\n");
 
        /* Allocate can/net device */
        net = alloc_candev(sizeof(struct mcp251x_priv), TX_ECHO_SKB_MAX);
@@ -1336,8 +1336,10 @@ static int mcp251x_can_probe(struct spi_device *spi)
                return -ENOMEM;
 
        ret = clk_prepare_enable(clk);
-       if (ret)
+       if (ret) {
+               dev_err_probe(&spi->dev, ret, "Cannot enable clock\n");
                goto out_free;
+       }
 
        net->netdev_ops = &mcp251x_netdev_ops;
        net->ethtool_ops = &mcp251x_ethtool_ops;
@@ -1362,20 +1364,25 @@ static int mcp251x_can_probe(struct spi_device *spi)
        else
                spi->max_speed_hz = spi->max_speed_hz ? : 10 * 1000 * 1000;
        ret = spi_setup(spi);
-       if (ret)
+       if (ret) {
+               dev_err_probe(&spi->dev, ret, "Cannot set up spi\n");
                goto out_clk;
+       }
 
        priv->power = devm_regulator_get_optional(&spi->dev, "vdd");
        priv->transceiver = devm_regulator_get_optional(&spi->dev, "xceiver");
        if ((PTR_ERR(priv->power) == -EPROBE_DEFER) ||
            (PTR_ERR(priv->transceiver) == -EPROBE_DEFER)) {
                ret = -EPROBE_DEFER;
+               dev_err_probe(&spi->dev, ret, "supply deferred\n");
                goto out_clk;
        }
 
        ret = mcp251x_power_enable(priv->power, 1);
-       if (ret)
+       if (ret) {
+               dev_err_probe(&spi->dev, ret, "Cannot enable power\n");
                goto out_clk;
+       }
 
        priv->wq = alloc_workqueue("mcp251x_wq",
                                   WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_PERCPU,
@@ -1409,21 +1416,24 @@ static int mcp251x_can_probe(struct spi_device *spi)
        /* Here is OK to not lock the MCP, no one knows about it yet */
        ret = mcp251x_hw_probe(spi);
        if (ret) {
-               if (ret == -ENODEV)
-                       dev_err(&spi->dev, "Cannot initialize MCP%x. Wrong wiring?\n",
-                               priv->model);
+               dev_err_probe(&spi->dev, ret, "Cannot initialize MCP%x. Wrong wiring?\n",
+                             priv->model);
                goto error_probe;
        }
 
        mcp251x_hw_sleep(spi);
 
        ret = register_candev(net);
-       if (ret)
+       if (ret) {
+               dev_err_probe(&spi->dev, ret, "Cannot register CAN device\n");
                goto error_probe;
+       }
 
        ret = mcp251x_gpio_setup(priv);
-       if (ret)
+       if (ret) {
+               dev_err_probe(&spi->dev, ret, "Cannot set up gpios\n");
                goto out_unregister_candev;
+       }
 
        netdev_info(net, "MCP%x successfully initialized.\n", priv->model);
        return 0;
@@ -1442,7 +1452,6 @@ out_clk:
 out_free:
        free_candev(net);
 
-       dev_err(&spi->dev, "Probe failed, err=%d\n", -ret);
        return ret;
 }