mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

can: mcp251xfd: mcp251xfd_probe(): use dev_err_probe() to simplify error handling 

dev_err_probe() can reduce code size, uniform error handling and record the
defer probe reason etc., use it to simplify the code.

Link: https://lore.kernel.org/r/20210128104644.2982125-9-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2020-10-16 18:03:59 +02:00
parent dfe99ba29e
commit cf8ee6de25
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
View File

@ -2849,32 +2849,28 @@ static int mcp251xfd_probe(struct spi_device *spi)
rx_int = devm_gpiod_get_optional(&spi->dev, "microchip,rx-int", rx_int = devm_gpiod_get_optional(&spi->dev, "microchip,rx-int",
GPIOD_IN); GPIOD_IN);
if (PTR_ERR(rx_int) == -EPROBE_DEFER) if (IS_ERR(rx_int))
return -EPROBE_DEFER; return dev_err_probe(&spi->dev, PTR_ERR(rx_int),
else if (IS_ERR(rx_int)) "Failed to get RX-INT!\n");
return PTR_ERR(rx_int);
reg_vdd = devm_regulator_get_optional(&spi->dev, "vdd"); reg_vdd = devm_regulator_get_optional(&spi->dev, "vdd");
if (PTR_ERR(reg_vdd) == -EPROBE_DEFER) if (PTR_ERR(reg_vdd) == -ENODEV)
return -EPROBE_DEFER;
else if (PTR_ERR(reg_vdd) == -ENODEV)
reg_vdd = NULL; reg_vdd = NULL;
else if (IS_ERR(reg_vdd)) else if (IS_ERR(reg_vdd))
return PTR_ERR(reg_vdd); return dev_err_probe(&spi->dev, PTR_ERR(reg_vdd),
"Failed to get VDD regulator!\n");
reg_xceiver = devm_regulator_get_optional(&spi->dev, "xceiver"); reg_xceiver = devm_regulator_get_optional(&spi->dev, "xceiver");
if (PTR_ERR(reg_xceiver) == -EPROBE_DEFER) if (PTR_ERR(reg_xceiver) == -ENODEV)
return -EPROBE_DEFER;
else if (PTR_ERR(reg_xceiver) == -ENODEV)
reg_xceiver = NULL; reg_xceiver = NULL;
else if (IS_ERR(reg_xceiver)) else if (IS_ERR(reg_xceiver))
return PTR_ERR(reg_xceiver); return dev_err_probe(&spi->dev, PTR_ERR(reg_xceiver),
"Failed to get Transceiver regulator!\n");
clk = devm_clk_get(&spi->dev, NULL); clk = devm_clk_get(&spi->dev, NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk))
dev_err(&spi->dev, "No Oscillator (clock) defined.\n"); dev_err_probe(&spi->dev, PTR_ERR(clk),
return PTR_ERR(clk); "Failed to get Oscillator (clock)!\n");
}
freq = clk_get_rate(clk); freq = clk_get_rate(clk);
/* Sanity check */ /* Sanity check */