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

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.org


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

sound/soc/codecs/wsa883x.c

+9 −12
Original line number Diff line number Diff line
@@ -1380,22 +1380,19 @@ static int wsa883x_probe(struct sdw_slave *pdev, 
		return -ENOMEM;



	wsa883x->vdd = devm_regulator_get(dev, "vdd");

	if (IS_ERR(wsa883x->vdd)) {

		dev_err(dev, "No vdd regulator found\n");

		return PTR_ERR(wsa883x->vdd);

	}

	if (IS_ERR(wsa883x->vdd))

		return dev_err_probe(dev, PTR_ERR(wsa883x->vdd),

				     "No vdd regulator found\n");



	ret = regulator_enable(wsa883x->vdd);

	if (ret) {

		dev_err(dev, "Failed to enable vdd regulator (%d)\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to enable vdd regulator\n");



	wsa883x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown",

						GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH);

	if (IS_ERR(wsa883x->sd_n)) {

		dev_err(&pdev->dev, "Shutdown Control GPIO not found\n");

		ret = PTR_ERR(wsa883x->sd_n);

		ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->sd_n),

				    "Shutdown Control GPIO not found\n");

		goto err;

	}
@@ -1416,8 +1413,8 @@ static int wsa883x_probe(struct sdw_slave *pdev, 
	wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config);

	if (IS_ERR(wsa883x->regmap)) {

		gpiod_direction_output(wsa883x->sd_n, 1);

		dev_err(&pdev->dev, "regmap_init failed\n");

		ret = PTR_ERR(wsa883x->regmap);

		ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->regmap),

				    "regmap_init failed\n");

		goto err;

	}

	pm_runtime_set_autosuspend_delay(dev, 3000);