shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: codecs: wcd938x: Simplify with dev_err_probe

Browse Source 
[ Upstream commit 60ba2fda52 ]

Replace dev_err() in probe() path with dev_err_probe() to:
1. Make code a bit simpler and easier to read,
2. Do not print messages on deferred probe.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230418074630.8681-4-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 69a026a235 ("ASoC: codecs: wcd938x: fix regulator leaks on probe errors")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Krzysztof Kozlowski
2023-04-18 09:46:30 +02:00
committed by Greg Kroah-Hartman
parent 629ba75200
commit 877fc75d2c
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/codecs/wcd938x.c
View File

@@ -3302,18 +3302,15 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device
int ret; int ret;
wcd938x->reset_gpio = of_get_named_gpio(dev->of_node, "reset-gpios", 0); wcd938x->reset_gpio = of_get_named_gpio(dev->of_node, "reset-gpios", 0);
if (wcd938x->reset_gpio < 0) { if (wcd938x->reset_gpio < 0)
dev_err(dev, "Failed to get reset gpio: err = %d\n", return dev_err_probe(dev, wcd938x->reset_gpio,
wcd938x->reset_gpio); "Failed to get reset gpio\n");
return wcd938x->reset_gpio;
}
wcd938x->us_euro_gpio = devm_gpiod_get_optional(dev, "us-euro", wcd938x->us_euro_gpio = devm_gpiod_get_optional(dev, "us-euro",
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(wcd938x->us_euro_gpio)) { if (IS_ERR(wcd938x->us_euro_gpio))
dev_err(dev, "us-euro swap Control GPIO not found\n"); return dev_err_probe(dev, PTR_ERR(wcd938x->us_euro_gpio),
return PTR_ERR(wcd938x->us_euro_gpio); "us-euro swap Control GPIO not found\n");
}
cfg->swap_gnd_mic = wcd938x_swap_gnd_mic; cfg->swap_gnd_mic = wcd938x_swap_gnd_mic;
@@ -3323,16 +3320,12 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device
wcd938x->supplies[3].supply = "vdd-mic-bias"; wcd938x->supplies[3].supply = "vdd-mic-bias";
ret = regulator_bulk_get(dev, WCD938X_MAX_SUPPLY, wcd938x->supplies); ret = regulator_bulk_get(dev, WCD938X_MAX_SUPPLY, wcd938x->supplies);
if (ret) { if (ret)
dev_err(dev, "Failed to get supplies: err = %d\n", ret); return dev_err_probe(dev, ret, "Failed to get supplies\n");
return ret;
}
ret = regulator_bulk_enable(WCD938X_MAX_SUPPLY, wcd938x->supplies); ret = regulator_bulk_enable(WCD938X_MAX_SUPPLY, wcd938x->supplies);
if (ret) { if (ret)
dev_err(dev, "Failed to enable supplies: err = %d\n", ret); return dev_err_probe(dev, ret, "Failed to enable supplies\n");
return ret;
}
wcd938x_dt_parse_micbias_info(dev, wcd938x); wcd938x_dt_parse_micbias_info(dev, wcd938x);