Commit b0ef489e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Vinod Koul
Browse files

dmaengine: xilinx: Simplify with dev_err_probe() 



Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200828152637.16903-3-krzk@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1c966e1d

drivers/dma/xilinx/xilinx_dma.c

+8 −28
Original line number Diff line number Diff line
@@ -2536,13 +2536,8 @@ static int axidma_clk_init(struct platform_device *pdev, struct clk **axi_clk, 
	*tmp_clk = NULL;



	*axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk");

	if (IS_ERR(*axi_clk)) {

		err = PTR_ERR(*axi_clk);

		if (err != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n",

				err);

		return err;

	}

	if (IS_ERR(*axi_clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(*axi_clk), "failed to get axi_aclk\n");



	*tx_clk = devm_clk_get(&pdev->dev, "m_axi_mm2s_aclk");

	if (IS_ERR(*tx_clk))
@@ -2603,22 +2598,12 @@ static int axicdma_clk_init(struct platform_device *pdev, struct clk **axi_clk, 
	*tmp2_clk = NULL;



	*axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk");

	if (IS_ERR(*axi_clk)) {

		err = PTR_ERR(*axi_clk);

		if (err != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to get axi_clk (%d)\n",

				err);

		return err;

	}

	if (IS_ERR(*axi_clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(*axi_clk), "failed to get axi_aclk\n");



	*dev_clk = devm_clk_get(&pdev->dev, "m_axi_aclk");

	if (IS_ERR(*dev_clk)) {

		err = PTR_ERR(*dev_clk);

		if (err != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to get dev_clk (%d)\n",

				err);

		return err;

	}

	if (IS_ERR(*dev_clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(*dev_clk), "failed to get dev_clk\n");



	err = clk_prepare_enable(*axi_clk);

	if (err) {
@@ -2647,13 +2632,8 @@ static int axivdma_clk_init(struct platform_device *pdev, struct clk **axi_clk, 
	int err;



	*axi_clk = devm_clk_get(&pdev->dev, "s_axi_lite_aclk");

	if (IS_ERR(*axi_clk)) {

		err = PTR_ERR(*axi_clk);

		if (err != -EPROBE_DEFER)

			dev_err(&pdev->dev, "failed to get axi_aclk (%d)\n",

				err);

		return err;

	}

	if (IS_ERR(*axi_clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(*axi_clk), "failed to get axi_aclk\n");



	*tx_clk = devm_clk_get(&pdev->dev, "m_axi_mm2s_aclk");

	if (IS_ERR(*tx_clk))