Commit a3497afb authored by Michal Simek's avatar Michal Simek Committed by Marc Kleine-Budde
Browse files

can: xilinx_can: Simplify code by using dev_err_probe() 

Use already prepared dev_err_probe() introduced by commit a787e540
("driver core: add device probe log helper").
It simplifies EPROBE_DEFER handling.

Also unify message format for similar error cases.

Link: https://lore.kernel.org/r/91af0945ed7397b08f1af0c829450620bd92b804.1612442564.git.michal.simek@xilinx.com


Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 51894cba

drivers/net/can/xilinx_can.c

+4 −6
Original line number Diff line number Diff line
@@ -1772,17 +1772,15 @@ static int xcan_probe(struct platform_device *pdev) 
	/* Getting the CAN can_clk info */

	priv->can_clk = devm_clk_get(&pdev->dev, "can_clk");

	if (IS_ERR(priv->can_clk)) {

		if (PTR_ERR(priv->can_clk) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Device clock not found.\n");

		ret = PTR_ERR(priv->can_clk);

		ret = dev_err_probe(&pdev->dev, PTR_ERR(priv->can_clk),

				    "device clock not found\n");

		goto err_free;

	}



	priv->bus_clk = devm_clk_get(&pdev->dev, devtype->bus_clk_name);

	if (IS_ERR(priv->bus_clk)) {

		if (PTR_ERR(priv->bus_clk) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "bus clock not found\n");

		ret = PTR_ERR(priv->bus_clk);

		ret = dev_err_probe(&pdev->dev, PTR_ERR(priv->bus_clk),

				    "bus clock not found\n");

		goto err_free;

	}