mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

ASoC: codecs: wsa883x: Simplify with dev_err_probe

Browse source 
Code can be a bit simpler with dev_err_probe().

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20221109163759.1158837-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2022-11-09 17:37:59 +01:00 committed by Mark Brown
parent 8e02238744
commit 6b6ab406ce
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sound/soc/codecs/wsa883x.c
View file

@ -1380,22 +1380,19 @@ static int wsa883x_probe(struct sdw_slave *pdev,
return -ENOMEM;
wsa883x->vdd = devm_regulator_get(dev, "vdd");
if (IS_ERR(wsa883x->vdd)) {
dev_err(dev, "No vdd regulator found\n");
return PTR_ERR(wsa883x->vdd);
}
if (IS_ERR(wsa883x->vdd))
return dev_err_probe(dev, PTR_ERR(wsa883x->vdd),
"No vdd regulator found\n");
ret = regulator_enable(wsa883x->vdd);
if (ret) {
dev_err(dev, "Failed to enable vdd regulator (%d)\n", ret);
return ret;
}
if (ret)
return dev_err_probe(dev, ret, "Failed to enable vdd regulator\n");
wsa883x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown",
GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH);
if (IS_ERR(wsa883x->sd_n)) {
dev_err(&pdev->dev, "Shutdown Control GPIO not found\n");
ret = PTR_ERR(wsa883x->sd_n);
ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->sd_n),
"Shutdown Control GPIO not found\n");
goto err;
}
@ -1416,8 +1413,8 @@ static int wsa883x_probe(struct sdw_slave *pdev,
wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config);
if (IS_ERR(wsa883x->regmap)) {
gpiod_direction_output(wsa883x->sd_n, 1);
dev_err(&pdev->dev, "regmap_init failed\n");
ret = PTR_ERR(wsa883x->regmap);
ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->regmap),
"regmap_init failed\n");
goto err;
}
pm_runtime_set_autosuspend_delay(dev, 3000);