Skip to content

Commit

Permalink
remoteproc: qcom_q6v5_pas: Simplify with dev_err_probe()
Browse files Browse the repository at this point in the history
Use dev_err_probe() to make error and defer code handling simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry 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: Bjorn Andersson <andersson@kernel.org>
  • Loading branch information
Krzysztof Kozlowski authored and Bjorn Andersson committed Nov 16, 2024
1 parent 576dac2 commit 427442e
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions drivers/remoteproc/qcom_q6v5_pas.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
"failed to get aggre2 clock");
return ret;
}
if (IS_ERR(adsp->aggre2_clk))
return dev_err_probe(adsp->dev, PTR_ERR(adsp->aggre2_clk),
"failed to get aggre2 clock");

return 0;
}
Expand Down

0 comments on commit 427442e

Please sign in to comment.