Skip to content

Commit 427442e

Browse files
krzkandersson
authored andcommitted
remoteproc: qcom_q6v5_pas: Simplify with dev_err_probe()
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>
1 parent 576dac2 commit 427442e

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

drivers/remoteproc/qcom_q6v5_pas.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -453,24 +453,16 @@ static const struct rproc_ops adsp_minidump_ops = {
453453

454454
static int adsp_init_clock(struct qcom_adsp *adsp)
455455
{
456-
int ret;
457-
458456
adsp->xo = devm_clk_get(adsp->dev, "xo");
459-
if (IS_ERR(adsp->xo)) {
460-
ret = PTR_ERR(adsp->xo);
461-
if (ret != -EPROBE_DEFER)
462-
dev_err(adsp->dev, "failed to get xo clock");
463-
return ret;
464-
}
457+
if (IS_ERR(adsp->xo))
458+
return dev_err_probe(adsp->dev, PTR_ERR(adsp->xo),
459+
"failed to get xo clock");
460+
465461

466462
adsp->aggre2_clk = devm_clk_get_optional(adsp->dev, "aggre2");
467-
if (IS_ERR(adsp->aggre2_clk)) {
468-
ret = PTR_ERR(adsp->aggre2_clk);
469-
if (ret != -EPROBE_DEFER)
470-
dev_err(adsp->dev,
471-
"failed to get aggre2 clock");
472-
return ret;
473-
}
463+
if (IS_ERR(adsp->aggre2_clk))
464+
return dev_err_probe(adsp->dev, PTR_ERR(adsp->aggre2_clk),
465+
"failed to get aggre2 clock");
474466

475467
return 0;
476468
}

0 commit comments

Comments
 (0)