Skip to content

Commit 60ba2fd

Browse files
krzkbroonie
authored andcommitted
ASoC: codecs: wcd938x: Simplify with dev_err_probe
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>
1 parent 92864de commit 60ba2fd

1 file changed

Lines changed: 10 additions & 17 deletions

File tree

sound/soc/codecs/wcd938x.c

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4235,18 +4235,15 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device
42354235
int ret;
42364236

42374237
wcd938x->reset_gpio = of_get_named_gpio(dev->of_node, "reset-gpios", 0);
4238-
if (wcd938x->reset_gpio < 0) {
4239-
dev_err(dev, "Failed to get reset gpio: err = %d\n",
4240-
wcd938x->reset_gpio);
4241-
return wcd938x->reset_gpio;
4242-
}
4238+
if (wcd938x->reset_gpio < 0)
4239+
return dev_err_probe(dev, wcd938x->reset_gpio,
4240+
"Failed to get reset gpio\n");
42434241

42444242
wcd938x->us_euro_gpio = devm_gpiod_get_optional(dev, "us-euro",
42454243
GPIOD_OUT_LOW);
4246-
if (IS_ERR(wcd938x->us_euro_gpio)) {
4247-
dev_err(dev, "us-euro swap Control GPIO not found\n");
4248-
return PTR_ERR(wcd938x->us_euro_gpio);
4249-
}
4244+
if (IS_ERR(wcd938x->us_euro_gpio))
4245+
return dev_err_probe(dev, PTR_ERR(wcd938x->us_euro_gpio),
4246+
"us-euro swap Control GPIO not found\n");
42504247

42514248
cfg->swap_gnd_mic = wcd938x_swap_gnd_mic;
42524249

@@ -4256,16 +4253,12 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device
42564253
wcd938x->supplies[3].supply = "vdd-mic-bias";
42574254

42584255
ret = regulator_bulk_get(dev, WCD938X_MAX_SUPPLY, wcd938x->supplies);
4259-
if (ret) {
4260-
dev_err(dev, "Failed to get supplies: err = %d\n", ret);
4261-
return ret;
4262-
}
4256+
if (ret)
4257+
return dev_err_probe(dev, ret, "Failed to get supplies\n");
42634258

42644259
ret = regulator_bulk_enable(WCD938X_MAX_SUPPLY, wcd938x->supplies);
4265-
if (ret) {
4266-
dev_err(dev, "Failed to enable supplies: err = %d\n", ret);
4267-
return ret;
4268-
}
4260+
if (ret)
4261+
return dev_err_probe(dev, ret, "Failed to enable supplies\n");
42694262

42704263
wcd938x_dt_parse_micbias_info(dev, wcd938x);
42714264

0 commit comments

Comments
 (0)