Unverified Commit fa92f429 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230418074630.8681-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3da9d149

sound/soc/codecs/wcd934x.c

+7 −12
Original line number Diff line number Diff line
@@ -5868,10 +5868,9 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) 
	slim_get_logical_addr(wcd->sidev);

	wcd->if_regmap = regmap_init_slimbus(wcd->sidev,

				  &wcd934x_ifc_regmap_config);

	if (IS_ERR(wcd->if_regmap)) {

		dev_err(dev, "Failed to allocate ifc register map\n");

		return PTR_ERR(wcd->if_regmap);

	}

	if (IS_ERR(wcd->if_regmap))

		return dev_err_probe(dev, PTR_ERR(wcd->if_regmap),

				     "Failed to allocate ifc register map\n");



	of_property_read_u32(dev->parent->of_node, "qcom,dmic-sample-rate",

			     &wcd->dmic_sample_rate);
@@ -5923,19 +5922,15 @@ static int wcd934x_codec_probe(struct platform_device *pdev) 
	memcpy(wcd->tx_chs, wcd934x_tx_chs, sizeof(wcd934x_tx_chs));



	irq = regmap_irq_get_virq(data->irq_data, WCD934X_IRQ_SLIMBUS);

	if (irq < 0) {

		dev_err(wcd->dev, "Failed to get SLIM IRQ\n");

		return irq;

	}

	if (irq < 0)

		return dev_err_probe(wcd->dev, irq, "Failed to get SLIM IRQ\n");



	ret = devm_request_threaded_irq(dev, irq, NULL,

					wcd934x_slim_irq_handler,

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					"slim", wcd);

	if (ret) {

		dev_err(dev, "Failed to request slimbus irq\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to request slimbus irq\n");



	wcd934x_register_mclk_output(wcd);

	platform_set_drvdata(pdev, wcd);