diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2026-02-03 19:46:26 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-02-05 21:46:43 +0300 |
| commit | 730b0af2748a74528e0ad25f2bcd3272e96db10a (patch) | |
| tree | a41fa7efb2429c82ba7f785a14aca892b0f8f35e | |
| parent | 7e2de68e4dbaee65864b0c5972e1b03037243632 (diff) | |
| download | linux-730b0af2748a74528e0ad25f2bcd3272e96db10a.tar.xz | |
ASoC: rockchip: spdif: Use dev_err_probe
Cleanup the probe routine a little bit by using dev_err_probe
instead of dev_err.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://patch.msgid.link/20260203-rockchip-spdif-cleanup-and-bsp-sync-v2-4-4412016cf577@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/rockchip/rockchip_spdif.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 841ef499ed7f..1c62fcb0d8d4 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) + return dev_err_probe(&pdev->dev, ret, "Could not register PCM\n"); return 0; } |