]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: xilinx_dma: Remove clk_get error message for probe defer
authorRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Thu, 26 Sep 2019 10:51:00 +0000 (16:21 +0530)
committerVinod Koul <vkoul@kernel.org>
Tue, 15 Oct 2019 10:11:46 +0000 (15:41 +0530)
In dma probe, the driver checks for devm_clk_get return and print error
message in the failing case. However for -EPROBE_DEFER this message is
confusing so avoid it.

Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/1569495060-18117-5-git-send-email-radhey.shyam.pandey@xilinx.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/xilinx/xilinx_dma.c

index fb87d0a62b2603e9f29766b32211fec766be1a41..94cdc410977bfcf6e6c4260cd554f935068990db 100644 (file)
@@ -2186,7 +2186,9 @@ static int axidma_clk_init(struct platform_device *pdev, struct clk **axi_clk,
        *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk");
        if (IS_ERR(*axi_clk)) {
                err = PTR_ERR(*axi_clk);
-               dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n", err);
+               if (err != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n",
+                               err);
                return err;
        }
 
@@ -2251,14 +2253,18 @@ static int axicdma_clk_init(struct platform_device *pdev, struct clk **axi_clk,
        *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk");
        if (IS_ERR(*axi_clk)) {
                err = PTR_ERR(*axi_clk);
-               dev_err(&pdev->dev, "failed to get axi_clk (%d)\n", err);
+               if (err != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to get axi_clk (%d)\n",
+                               err);
                return err;
        }
 
        *dev_clk = devm_clk_get(&pdev->dev, "m_axi_aclk");
        if (IS_ERR(*dev_clk)) {
                err = PTR_ERR(*dev_clk);
-               dev_err(&pdev->dev, "failed to get dev_clk (%d)\n", err);
+               if (err != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to get dev_clk (%d)\n",
+                               err);
                return err;
        }
 
@@ -2291,7 +2297,9 @@ static int axivdma_clk_init(struct platform_device *pdev, struct clk **axi_clk,
        *axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk");
        if (IS_ERR(*axi_clk)) {
                err = PTR_ERR(*axi_clk);
-               dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n", err);
+               if (err != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n",
+                               err);
                return err;
        }
 
@@ -2313,7 +2321,8 @@ static int axivdma_clk_init(struct platform_device *pdev, struct clk **axi_clk,
 
        err = clk_prepare_enable(*axi_clk);
        if (err) {
-               dev_err(&pdev->dev, "failed to enable axi_clk (%d)\n", err);
+               dev_err(&pdev->dev, "failed to enable axi_clk (%d)\n",
+                       err);
                return err;
        }