Skip to content

Commit 6a93ea3

Browse files
andy-shevmarckleinebudde
authored andcommitted
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/[email protected] Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent dc64d98 commit 6a93ea3

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

drivers/net/can/spi/hi311x.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -837,10 +837,8 @@ static int hi3110_can_probe(struct spi_device *spi)
837837
int ret;
838838

839839
clk = devm_clk_get_optional(&spi->dev, NULL);
840-
if (IS_ERR(clk)) {
841-
dev_err(&spi->dev, "no CAN clock source defined\n");
842-
return PTR_ERR(clk);
843-
}
840+
if (IS_ERR(clk))
841+
return dev_err_probe(dev, PTR_ERR(clk), "no CAN clock source defined\n");
844842

845843
if (clk) {
846844
freq = clk_get_rate(clk);
@@ -925,9 +923,7 @@ static int hi3110_can_probe(struct spi_device *spi)
925923

926924
ret = hi3110_hw_probe(spi);
927925
if (ret) {
928-
if (ret == -ENODEV)
929-
dev_err(&spi->dev, "Cannot initialize %x. Wrong wiring?\n",
930-
priv->model);
926+
dev_err_probe(dev, ret, "Cannot initialize %x. Wrong wiring?\n", priv->model);
931927
goto error_probe;
932928
}
933929
hi3110_hw_sleep(spi);
@@ -950,8 +946,7 @@ static int hi3110_can_probe(struct spi_device *spi)
950946
out_free:
951947
free_candev(net);
952948

953-
dev_err(&spi->dev, "Probe failed, err=%d\n", -ret);
954-
return ret;
949+
return dev_err_probe(dev, ret, "Probe failed\n");
955950
}
956951

957952
static int hi3110_can_remove(struct spi_device *spi)

0 commit comments

Comments
 (0)