Skip to content

Commit fa92f42

Browse files
krzkbroonie
authored andcommitted
ASoC: codecs: wcd934x: 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-2-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 3da9d14 commit fa92f42

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

sound/soc/codecs/wcd934x.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5868,10 +5868,9 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd)
58685868
slim_get_logical_addr(wcd->sidev);
58695869
wcd->if_regmap = regmap_init_slimbus(wcd->sidev,
58705870
&wcd934x_ifc_regmap_config);
5871-
if (IS_ERR(wcd->if_regmap)) {
5872-
dev_err(dev, "Failed to allocate ifc register map\n");
5873-
return PTR_ERR(wcd->if_regmap);
5874-
}
5871+
if (IS_ERR(wcd->if_regmap))
5872+
return dev_err_probe(dev, PTR_ERR(wcd->if_regmap),
5873+
"Failed to allocate ifc register map\n");
58755874

58765875
of_property_read_u32(dev->parent->of_node, "qcom,dmic-sample-rate",
58775876
&wcd->dmic_sample_rate);
@@ -5923,19 +5922,15 @@ static int wcd934x_codec_probe(struct platform_device *pdev)
59235922
memcpy(wcd->tx_chs, wcd934x_tx_chs, sizeof(wcd934x_tx_chs));
59245923

59255924
irq = regmap_irq_get_virq(data->irq_data, WCD934X_IRQ_SLIMBUS);
5926-
if (irq < 0) {
5927-
dev_err(wcd->dev, "Failed to get SLIM IRQ\n");
5928-
return irq;
5929-
}
5925+
if (irq < 0)
5926+
return dev_err_probe(wcd->dev, irq, "Failed to get SLIM IRQ\n");
59305927

59315928
ret = devm_request_threaded_irq(dev, irq, NULL,
59325929
wcd934x_slim_irq_handler,
59335930
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
59345931
"slim", wcd);
5935-
if (ret) {
5936-
dev_err(dev, "Failed to request slimbus irq\n");
5937-
return ret;
5938-
}
5932+
if (ret)
5933+
return dev_err_probe(dev, ret, "Failed to request slimbus irq\n");
59395934

59405935
wcd934x_register_mclk_output(wcd);
59415936
platform_set_drvdata(pdev, wcd);

0 commit comments

Comments
 (0)