ASoC: img: Use dev_err_probe() helper

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

diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c
index 4f90d36dc7dfdc56acf4be32f65c4b3e048419cc..28f48ca1508a60997592af5e0d527b5dab841dc1 100644 (file)
--- a/sound/soc/img/img-i2s-out.c
+++ b/sound/soc/img/img-i2s-out.c
@@ -457,25 +457,19 @@ static int img_i2s_out_probe(struct platform_device *pdev)
        i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20);
 
        i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
-       if (IS_ERR(i2s->rst)) {
-               if (PTR_ERR(i2s->rst) != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "No top level reset found\n");
-               return PTR_ERR(i2s->rst);
-       }
+       if (IS_ERR(i2s->rst))
+               return dev_err_probe(&pdev->dev, PTR_ERR(i2s->rst),
+                                    "No top level reset found\n");
 
        i2s->clk_sys = devm_clk_get(&pdev->dev, "sys");
-       if (IS_ERR(i2s->clk_sys)) {
-               if (PTR_ERR(i2s->clk_sys) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'sys'\n");
-               return PTR_ERR(i2s->clk_sys);
-       }
+       if (IS_ERR(i2s->clk_sys))
+               return dev_err_probe(dev, PTR_ERR(i2s->clk_sys),
+                                    "Failed to acquire clock 'sys'\n");
 
        i2s->clk_ref = devm_clk_get(&pdev->dev, "ref");
-       if (IS_ERR(i2s->clk_ref)) {
-               if (PTR_ERR(i2s->clk_ref) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'ref'\n");
-               return PTR_ERR(i2s->clk_ref);
-       }
+       if (IS_ERR(i2s->clk_ref))
+               return dev_err_probe(dev, PTR_ERR(i2s->clk_ref),
+                                    "Failed to acquire clock 'ref'\n");
 
        i2s->suspend_ch_ctl = devm_kcalloc(dev,
                i2s->max_i2s_chan, sizeof(*i2s->suspend_ch_ctl), GFP_KERNEL);