Thread (17 messages) 17 messages, 4 authors, 2026-01-28

Re: [PATCH 04/10] ASoC: rockchip: spdif: Use dev_err_probe

From: Alexey Charkov <alchark@gmail.com>
Date: 2026-01-27 17:31:30
Also in: linux-rockchip, linux-sound, lkml

Hi Sebastian,

On Tue, Jan 27, 2026 at 8:08 PM Sebastian Reichel
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
Cleanup the probe routine a little bit by using dev_err_probe
instead of dev_err.

Signed-off-by: Sebastian Reichel <redacted>
---
 sound/soc/rockchip/rockchip_spdif.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c
index 841ef499ed7f..20ed64c1fa42 100644
--- a/sound/soc/rockchip/rockchip_spdif.c
+++ b/sound/soc/rockchip/rockchip_spdif.c
@@ -279,11 +279,9 @@ static int rk_spdif_probe(struct platform_device *pdev)
                struct regmap *grf;

                grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
-               if (IS_ERR(grf)) {
-                       dev_err(&pdev->dev,
+               if (IS_ERR(grf))
+                       return dev_err_probe(&pdev->dev, PTR_ERR(grf),
                                "rockchip_spdif missing 'rockchip,grf'\n");
-                       return PTR_ERR(grf);
-               }

                /* Select the 8 channel SPDIF solution on RK3288 as
                 * the 2 channel one does not appear to work
@@ -334,16 +332,12 @@ static int rk_spdif_probe(struct platform_device *pdev)
        ret = devm_snd_soc_register_component(&pdev->dev,
                                              &rk_spdif_component,
                                              &rk_spdif_dai, 1);
-       if (ret) {
-               dev_err(&pdev->dev, "Could not register DAI\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "Could not register DAI\n");

        ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
-       if (ret) {
-               dev_err(&pdev->dev, "Could not register PCM\n");
-               return ret;
-       }
+       if (ret)
+               dev_err_probe(&pdev->dev, ret, "Could not register PCM\n");
Shouldn't this one return the error code, instead of falling through
to 'return 0'?
        return 0;
 }

--
2.51.0
Best regards,
Alexey
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help