]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
firmware: qcom_scm: Always return devm_clk_get_optional errors
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Sat, 24 Jun 2023 12:23:46 +0000 (14:23 +0200)
committerBjorn Andersson <andersson@kernel.org>
Mon, 24 Jul 2023 02:35:02 +0000 (19:35 -0700)
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: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230623-topic-scm_cleanup-v2-2-9db8c583138d@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/firmware/qcom_scm.c

index 237d05d6208b41e05240fd3cd458226645dbd23c..b8398002205d0572ccca3d727626760cc21e8495 100644 (file)
@@ -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)
-                       return PTR_ERR(scm->core_clk);
-       }
+       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)
-                       return PTR_ERR(scm->iface_clk);
-       }
+       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)
-                       return PTR_ERR(scm->bus_clk);
-       }
+       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;