Commit 6a93ea38 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Marc Kleine-Budde

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.comSigned-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent dc64d98a
...@@ -837,10 +837,8 @@ static int hi3110_can_probe(struct spi_device *spi) ...@@ -837,10 +837,8 @@ static int hi3110_can_probe(struct spi_device *spi)
int ret; int ret;
clk = devm_clk_get_optional(&spi->dev, NULL); clk = devm_clk_get_optional(&spi->dev, NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk))
dev_err(&spi->dev, "no CAN clock source defined\n"); return dev_err_probe(dev, PTR_ERR(clk), "no CAN clock source defined\n");
return PTR_ERR(clk);
}
if (clk) { if (clk) {
freq = clk_get_rate(clk); freq = clk_get_rate(clk);
...@@ -925,9 +923,7 @@ static int hi3110_can_probe(struct spi_device *spi) ...@@ -925,9 +923,7 @@ static int hi3110_can_probe(struct spi_device *spi)
ret = hi3110_hw_probe(spi); ret = hi3110_hw_probe(spi);
if (ret) { if (ret) {
if (ret == -ENODEV) dev_err_probe(dev, ret, "Cannot initialize %x. Wrong wiring?\n", priv->model);
dev_err(&spi->dev, "Cannot initialize %x. Wrong wiring?\n",
priv->model);
goto error_probe; goto error_probe;
} }
hi3110_hw_sleep(spi); hi3110_hw_sleep(spi);
...@@ -950,8 +946,7 @@ static int hi3110_can_probe(struct spi_device *spi) ...@@ -950,8 +946,7 @@ static int hi3110_can_probe(struct spi_device *spi)
out_free: out_free:
free_candev(net); free_candev(net);
dev_err(&spi->dev, "Probe failed, err=%d\n", -ret); return dev_err_probe(dev, ret, "Probe failed\n");
return ret;
} }
static int hi3110_can_remove(struct spi_device *spi) static int hi3110_can_remove(struct spi_device *spi)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment