Commit 944879ba authored by Radhey Shyam Pandey's avatar Radhey Shyam Pandey Committed by Vinod Koul
Browse files

dmaengine: xilinx_dma: Remove clk_get error message for probe defer 



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: default avatarRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: default avatarMichal 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: default avatarVinod Koul <vkoul@kernel.org>
parent a8bd4754

drivers/dma/xilinx/xilinx_dma.c

+14 −5
Original line number Diff line number Diff line
@@ -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;

	}