]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
can: xilinx_can: Simplify code by using dev_err_probe()
authorMichal Simek <michal.simek@xilinx.com>
Thu, 4 Feb 2021 12:42:48 +0000 (13:42 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 30 Mar 2021 09:14:46 +0000 (11:14 +0200)
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>
drivers/net/can/xilinx_can.c

index 37fa19c62d733a7e1f6cb9b678e72dc04ec27d39..3b883e607d8bafdffb5df7a5bc7de440b7589563 100644 (file)
@@ -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;
        }