ASoC: img: Use dev_err_probe() helper

Use the dev_err_probe() helper, instead of open-coding the same
operation.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20211214020843.2225831-16-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c
index 1bf5d6edbd323d7e87d8548e3826d3c522918f4a..f1f36f15a503eeeb54913d3ebe3d0743c5c750ef 100644 (file)
--- a/sound/soc/img/img-i2s-in.c
+++ b/sound/soc/img/img-i2s-in.c
@@ -451,11 +451,9 @@ static int img_i2s_in_probe(struct platform_device *pdev)
        i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20);
 
        i2s->clk_sys = devm_clk_get(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");
 
        pm_runtime_enable(&pdev->dev);
        if (!pm_runtime_enabled(&pdev->dev)) {

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);

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)

diff --git a/sound/soc/img/img-spdif-in.c b/sound/soc/img/img-spdif-in.c
index 6364eb742f6d8aa1e89da7965d592e5841cbee46..95914d0612fe74bf088054cfba90b9b3f6bfd9a3 100644 (file)
--- a/sound/soc/img/img-spdif-in.c
+++ b/sound/soc/img/img-spdif-in.c
@@ -739,11 +739,9 @@ static int img_spdif_in_probe(struct platform_device *pdev)
        spdif->base = base;
 
        spdif->clk_sys = devm_clk_get(dev, "sys");
-       if (IS_ERR(spdif->clk_sys)) {
-               if (PTR_ERR(spdif->clk_sys) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'sys'\n");
-               return PTR_ERR(spdif->clk_sys);
-       }
+       if (IS_ERR(spdif->clk_sys))
+               return dev_err_probe(dev, PTR_ERR(spdif->clk_sys),
+                                    "Failed to acquire clock 'sys'\n");
 
        pm_runtime_enable(&pdev->dev);
        if (!pm_runtime_enabled(&pdev->dev)) {

diff --git a/sound/soc/img/img-spdif-out.c b/sound/soc/img/img-spdif-out.c
index 858e1b85382093ee98b77eaf02294d8335f5d9ed..c3189d9ff72f4c8fcca2a0f18d06d256a5786c9d 100644 (file)
--- a/sound/soc/img/img-spdif-out.c
+++ b/sound/soc/img/img-spdif-out.c
@@ -342,25 +342,19 @@ static int img_spdif_out_probe(struct platform_device *pdev)
        spdif->base = base;
 
        spdif->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
-       if (IS_ERR(spdif->rst)) {
-               if (PTR_ERR(spdif->rst) != -EPROBE_DEFER)
-                       dev_err(&pdev->dev, "No top level reset found\n");
-               return PTR_ERR(spdif->rst);
-       }
+       if (IS_ERR(spdif->rst))
+               return dev_err_probe(&pdev->dev, PTR_ERR(spdif->rst),
+                                    "No top level reset found\n");
 
        spdif->clk_sys = devm_clk_get(&pdev->dev, "sys");
-       if (IS_ERR(spdif->clk_sys)) {
-               if (PTR_ERR(spdif->clk_sys) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'sys'\n");
-               return PTR_ERR(spdif->clk_sys);
-       }
+       if (IS_ERR(spdif->clk_sys))
+               return dev_err_probe(dev, PTR_ERR(spdif->clk_sys),
+                                    "Failed to acquire clock 'sys'\n");
 
        spdif->clk_ref = devm_clk_get(&pdev->dev, "ref");
-       if (IS_ERR(spdif->clk_ref)) {
-               if (PTR_ERR(spdif->clk_ref) != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to acquire clock 'ref'\n");
-               return PTR_ERR(spdif->clk_ref);
-       }
+       if (IS_ERR(spdif->clk_ref))
+               return dev_err_probe(dev, PTR_ERR(spdif->clk_ref),
+                                    "Failed to acquire clock 'ref'\n");
 
        pm_runtime_enable(&pdev->dev);
        if (!pm_runtime_enabled(&pdev->dev)) {

diff --git a/sound/soc/img/pistachio-internal-dac.c b/sound/soc/img/pistachio-internal-dac.c
index fe181c2e51d65c3f537b73dd884c50c0546043eb..802c0ee63aa26f3b46bb611621aaa9e4b3cf4754 100644 (file)
--- a/sound/soc/img/pistachio-internal-dac.c
+++ b/sound/soc/img/pistachio-internal-dac.c
@@ -161,12 +161,9 @@ static int pistachio_internal_dac_probe(struct platform_device *pdev)
                return PTR_ERR(dac->regmap);
 
        dac->supply = devm_regulator_get(dev, "VDD");
-       if (IS_ERR(dac->supply)) {
-               ret = PTR_ERR(dac->supply);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "failed to acquire supply 'VDD-supply': %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(dac->supply))
+               return dev_err_probe(dev, PTR_ERR(dac->supply),
+                                    "failed to acquire supply 'VDD-supply'\n");
 
        ret = regulator_enable(dac->supply);
        if (ret) {