Commit ae76fd3f authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

firmware: qcom_scm: Always return devm_clk_get_optional errors 



If devm_clk_get_optional throws an error, something is really wrong.
It may be a probe deferral, or it may be a problem with the clock
provider.

Regardless of what it may be, it should definitely not be ignored.
Stop doing that.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230623-topic-scm_cleanup-v2-2-9db8c583138d@linaro.org


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

drivers/firmware/qcom_scm.c

+6 −12
Original line number Diff line number Diff line
@@ -1419,22 +1419,16 @@ static int qcom_scm_probe(struct platform_device *pdev) 
				     "failed to acquire interconnect path\n");



	scm->core_clk = devm_clk_get_optional(&pdev->dev, "core");

	if (IS_ERR(scm->core_clk)) {

		if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER)

	if (IS_ERR(scm->core_clk))

		return PTR_ERR(scm->core_clk);

	}



	scm->iface_clk = devm_clk_get_optional(&pdev->dev, "iface");

	if (IS_ERR(scm->iface_clk)) {

		if (PTR_ERR(scm->iface_clk) == -EPROBE_DEFER)

	if (IS_ERR(scm->iface_clk))

		return PTR_ERR(scm->iface_clk);

	}



	scm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus");

	if (IS_ERR(scm->bus_clk)) {

		if (PTR_ERR(scm->bus_clk) == -EPROBE_DEFER)

	if (IS_ERR(scm->bus_clk))

		return PTR_ERR(scm->bus_clk);

	}



	scm->reset.ops = &qcom_scm_pas_reset_ops;

	scm->reset.nr_resets = 1;