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

dmaengine: stm32: 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-2-krzk@kernel.org


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

drivers/dma/stm32-dma.c

+2 −6
Original line number Diff line number Diff line
@@ -1311,12 +1311,8 @@ static int stm32_dma_probe(struct platform_device *pdev) 
		return PTR_ERR(dmadev->base);



	dmadev->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(dmadev->clk)) {

		ret = PTR_ERR(dmadev->clk);

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Can't get clock\n");

		return ret;

	}

	if (IS_ERR(dmadev->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(dmadev->clk), "Can't get clock\n");



	ret = clk_prepare_enable(dmadev->clk);

	if (ret < 0) {

drivers/dma/stm32-dmamux.c

+3 −6
Original line number Diff line number Diff line
@@ -252,12 +252,9 @@ static int stm32_dmamux_probe(struct platform_device *pdev) 
	spin_lock_init(&stm32_dmamux->lock);



	stm32_dmamux->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(stm32_dmamux->clk)) {

		ret = PTR_ERR(stm32_dmamux->clk);

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Missing clock controller\n");

		return ret;

	}

	if (IS_ERR(stm32_dmamux->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(stm32_dmamux->clk),

				     "Missing clock controller\n");



	ret = clk_prepare_enable(stm32_dmamux->clk);

	if (ret < 0) {

drivers/dma/stm32-mdma.c

+3 −6
Original line number Diff line number Diff line
@@ -1580,12 +1580,9 @@ static int stm32_mdma_probe(struct platform_device *pdev) 
		return PTR_ERR(dmadev->base);



	dmadev->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(dmadev->clk)) {

		ret = PTR_ERR(dmadev->clk);

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Missing clock controller\n");

		return ret;

	}

	if (IS_ERR(dmadev->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(dmadev->clk),

				     "Missing clock controller\n");



	ret = clk_prepare_enable(dmadev->clk);

	if (ret < 0) {