Commit 427442e8 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

remoteproc: qcom_q6v5_pas: Simplify with dev_err_probe() 



Use dev_err_probe() to make error and defer code handling simpler.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20241011-remote-proc-dev-err-probe-v1-8-5abb4fc61eca@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 576dac28

drivers/remoteproc/qcom_q6v5_pas.c

+7 −15
Original line number Diff line number Diff line
@@ -453,24 +453,16 @@ static const struct rproc_ops adsp_minidump_ops = { 


static int adsp_init_clock(struct qcom_adsp *adsp)

{

	int ret;



	adsp->xo = devm_clk_get(adsp->dev, "xo");

	if (IS_ERR(adsp->xo)) {

		ret = PTR_ERR(adsp->xo);

		if (ret != -EPROBE_DEFER)

			dev_err(adsp->dev, "failed to get xo clock");

		return ret;

	}

	if (IS_ERR(adsp->xo))

		return dev_err_probe(adsp->dev, PTR_ERR(adsp->xo),

				     "failed to get xo clock");





	adsp->aggre2_clk = devm_clk_get_optional(adsp->dev, "aggre2");

	if (IS_ERR(adsp->aggre2_clk)) {

		ret = PTR_ERR(adsp->aggre2_clk);

		if (ret != -EPROBE_DEFER)

			dev_err(adsp->dev,

	if (IS_ERR(adsp->aggre2_clk))

		return dev_err_probe(adsp->dev, PTR_ERR(adsp->aggre2_clk),

				     "failed to get aggre2 clock");

		return ret;

	}



	return 0;

}