Commit 6b6ab406 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

ASoC: codecs: wsa883x: Simplify with dev_err_probe

Code can be a bit simpler with dev_err_probe().
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20221109163759.1158837-2-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8e022387
...@@ -1380,22 +1380,19 @@ static int wsa883x_probe(struct sdw_slave *pdev, ...@@ -1380,22 +1380,19 @@ static int wsa883x_probe(struct sdw_slave *pdev,
return -ENOMEM; return -ENOMEM;
wsa883x->vdd = devm_regulator_get(dev, "vdd"); wsa883x->vdd = devm_regulator_get(dev, "vdd");
if (IS_ERR(wsa883x->vdd)) { if (IS_ERR(wsa883x->vdd))
dev_err(dev, "No vdd regulator found\n"); return dev_err_probe(dev, PTR_ERR(wsa883x->vdd),
return PTR_ERR(wsa883x->vdd); "No vdd regulator found\n");
}
ret = regulator_enable(wsa883x->vdd); ret = regulator_enable(wsa883x->vdd);
if (ret) { if (ret)
dev_err(dev, "Failed to enable vdd regulator (%d)\n", ret); return dev_err_probe(dev, ret, "Failed to enable vdd regulator\n");
return ret;
}
wsa883x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown", wsa883x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown",
GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH); GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH);
if (IS_ERR(wsa883x->sd_n)) { if (IS_ERR(wsa883x->sd_n)) {
dev_err(&pdev->dev, "Shutdown Control GPIO not found\n"); ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->sd_n),
ret = PTR_ERR(wsa883x->sd_n); "Shutdown Control GPIO not found\n");
goto err; goto err;
} }
...@@ -1416,8 +1413,8 @@ static int wsa883x_probe(struct sdw_slave *pdev, ...@@ -1416,8 +1413,8 @@ static int wsa883x_probe(struct sdw_slave *pdev,
wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config); wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config);
if (IS_ERR(wsa883x->regmap)) { if (IS_ERR(wsa883x->regmap)) {
gpiod_direction_output(wsa883x->sd_n, 1); gpiod_direction_output(wsa883x->sd_n, 1);
dev_err(&pdev->dev, "regmap_init failed\n"); ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->regmap),
ret = PTR_ERR(wsa883x->regmap); "regmap_init failed\n");
goto err; goto err;
} }
pm_runtime_set_autosuspend_delay(dev, 3000); pm_runtime_set_autosuspend_delay(dev, 3000);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment