ASoC: img: Use dev_err_probe() helper

[sfrench/cifs-2.6.git] / sound / soc / img / img-parallel-out.c

diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c
index ce0f08d3777c611b54716689ae48c68a16922ef5..800f247283cd878482901da7a954d20832167e9f 100644 (file)
--- a/sound/soc/img/img-parallel-out.c
+++ b/sound/soc/img/img-parallel-out.c
@@ -229,25 +229,19 @@ static int img_prl_out_probe(struct platform_device *pdev)
        prl->base = base;
 
        prl->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
-       if (IS_ERR(prl->rst)) {
-               if (PTR_ERR(prl->rst) != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "No top level reset found\n");
-               return PTR_ERR(prl->rst);
-       }
+       if (IS_ERR(prl->rst))
+               return dev_err_probe(&pdev->dev, PTR_ERR(prl->rst),
+                                    "No top level reset found\n");
 
        prl->clk_sys = devm_clk_get(&pdev->dev, "sys");
-       if (IS_ERR(prl->clk_sys)) {
-               if (PTR_ERR(prl->clk_sys) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'sys'\n");
-               return PTR_ERR(prl->clk_sys);
-       }
+       if (IS_ERR(prl->clk_sys))
+               return dev_err_probe(dev, PTR_ERR(prl->clk_sys),
+                                    "Failed to acquire clock 'sys'\n");
 
        prl->clk_ref = devm_clk_get(&pdev->dev, "ref");
-       if (IS_ERR(prl->clk_ref)) {
-               if (PTR_ERR(prl->clk_ref) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'ref'\n");
-               return PTR_ERR(prl->clk_ref);
-       }
+       if (IS_ERR(prl->clk_ref))
+               return dev_err_probe(dev, PTR_ERR(prl->clk_ref),
+                                    "Failed to acquire clock 'ref'\n");
 
        ret = clk_prepare_enable(prl->clk_sys);
        if (ret)