dmaengine: pl330: Simplify with dev_err_probe()
Subsystems (3)
PATCH 1/3 dmaengine: pl330: 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 Krzysztof Kozlowski <[email protected]>
--- drivers/dma/pl330.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/dma/pl330.c +3 -6
@@ -3034,9 +3034,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) pl330->rstc =devm_reset_control_get_optional (&adev->dev,"dma" );if (IS_ERR (pl330->rstc)) { -if (PTR_ERR (pl330->rstc) != -EPROBE_DEFER ) -dev_err (&adev->dev,"Failed to get reset!\n" ); -return PTR_ERR (pl330->rstc); +return dev_err_probe (&adev->dev,PTR_ERR (pl330->rstc),"Failed to get reset!\n" ); }else { ret =reset_control_deassert (pl330->rstc);if (ret) {
@@ -3047,9 +3045,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) pl330->rstc_ocp =devm_reset_control_get_optional (&adev->dev,"dma-ocp" );if (IS_ERR (pl330->rstc_ocp)) { -if (PTR_ERR (pl330->rstc_ocp) != -EPROBE_DEFER ) -dev_err (&adev->dev,"Failed to get OCP reset!\n" ); -return PTR_ERR (pl330->rstc_ocp); +return dev_err_probe (&adev->dev,PTR_ERR (pl330->rstc_ocp), +"Failed to get OCP reset!\n" ); }else { ret =reset_control_deassert (pl330->rstc_ocp);if (ret) {
Signature · 1 line
2.17.1
PATCH 2/3 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 Krzysztof Kozlowski <[email protected]>
--- drivers/dma/stm32-dma.c | 8 ++------ drivers/dma/stm32-dmamux.c | 9 +++------ drivers/dma/stm32-mdma.c | 9 +++------ 3 files changed, 8 insertions(+), 18 deletions(-)
drivers/dma/stm32-dma.c +2 -6
@@ -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
@@ -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
@@ -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 ) {
Signature · 1 line
2.17.1
PATCH 3/3 dmaengine: xilinx: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
Signed-off-by Krzysztof Kozlowski <[email protected]>
--- drivers/dma/xilinx/xilinx_dma.c | 36 ++++++++------------------------- 1 file changed, 8 insertions(+), 28 deletions(-)
drivers/dma/xilinx/xilinx_dma.c +8 -28
@@ -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))
Signature · 1 line
2.17.1
Quoted 2 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.
Applied all, thanks
Signature · 1 line
~Vinod