Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: xilinx_can: Simplify code by using dev_err_probe()

Use already prepared dev_err_probe() introduced by commit a787e5400a1c
("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: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

authored by

Michal Simek and committed by
Marc Kleine-Budde
a3497afb 51894cba

+4 -6
+4 -6
drivers/net/can/xilinx_can.c
··· 1772 1772 /* Getting the CAN can_clk info */ 1773 1773 priv->can_clk = devm_clk_get(&pdev->dev, "can_clk"); 1774 1774 if (IS_ERR(priv->can_clk)) { 1775 - if (PTR_ERR(priv->can_clk) != -EPROBE_DEFER) 1776 - dev_err(&pdev->dev, "Device clock not found.\n"); 1777 - ret = PTR_ERR(priv->can_clk); 1775 + ret = dev_err_probe(&pdev->dev, PTR_ERR(priv->can_clk), 1776 + "device clock not found\n"); 1778 1777 goto err_free; 1779 1778 } 1780 1779 1781 1780 priv->bus_clk = devm_clk_get(&pdev->dev, devtype->bus_clk_name); 1782 1781 if (IS_ERR(priv->bus_clk)) { 1783 - if (PTR_ERR(priv->bus_clk) != -EPROBE_DEFER) 1784 - dev_err(&pdev->dev, "bus clock not found\n"); 1785 - ret = PTR_ERR(priv->bus_clk); 1782 + ret = dev_err_probe(&pdev->dev, PTR_ERR(priv->bus_clk), 1783 + "bus clock not found\n"); 1786 1784 goto err_free; 1787 1785 } 1788 1786