diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-12-06 17:55:42 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2021-12-08 10:20:33 +0100 |
| commit | 6a93ea38217706ef8318efba672b960bcd5d0642 (patch) | |
| tree | ad6d76eadb1b6003a8cd2d7feff2fe2cd72a4ce2 | |
| parent | can: hi311x: hi3110_can_probe(): make use of device property API (diff) | |
| download | linux-6a93ea38217706ef8318efba672b960bcd5d0642.tar.xz linux-6a93ea38217706ef8318efba672b960bcd5d0642.zip | |
can: hi311x: hi3110_can_probe(): convert to use dev_err_probe()
When deferred the reason is saved for further debugging. Besides that,
it's fine to call dev_err_probe() in ->probe() when error code is
known. Convert the driver to use dev_err_probe().
Link: https://lore.kernel.org/all/20211206165542.69887-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | drivers/net/can/spi/hi311x.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index 78044ec24575..a17641d36468 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -837,10 +837,8 @@ static int hi3110_can_probe(struct spi_device *spi) int ret; clk = devm_clk_get_optional(&spi->dev, NULL); - if (IS_ERR(clk)) { - dev_err(&spi->dev, "no CAN clock source defined\n"); - return PTR_ERR(clk); - } + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), "no CAN clock source defined\n"); if (clk) { freq = clk_get_rate(clk); @@ -925,9 +923,7 @@ static int hi3110_can_probe(struct spi_device *spi) ret = hi3110_hw_probe(spi); if (ret) { - if (ret == -ENODEV) - dev_err(&spi->dev, "Cannot initialize %x. Wrong wiring?\n", - priv->model); + dev_err_probe(dev, ret, "Cannot initialize %x. Wrong wiring?\n", priv->model); goto error_probe; } hi3110_hw_sleep(spi); @@ -950,8 +946,7 @@ static int hi3110_can_probe(struct spi_device *spi) out_free: free_candev(net); - dev_err(&spi->dev, "Probe failed, err=%d\n", -ret); - return ret; + return dev_err_probe(dev, ret, "Probe failed\n"); } static int hi3110_can_remove(struct spi_device *spi) |