]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
firmware: qcom: scom: Simplify mutex with guard
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Mon, 16 Feb 2026 09:15:28 +0000 (10:15 +0100)
committerBjorn Andersson <andersson@kernel.org>
Wed, 18 Mar 2026 12:20:21 +0000 (07:20 -0500)
Simplify error path unlocking mutex with the guard.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260216091525.107935-6-krzysztof.kozlowski@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/firmware/qcom/qcom_scm.c

index 5c4375a7fa1f488a37da412aca2fa32b7857bf26..ca6cedf25677d1452a9b28b3e4e4e360b47a20bc 100644 (file)
@@ -199,19 +199,18 @@ static int qcom_scm_bw_enable(void)
        if (!__scm->path)
                return 0;
 
-       mutex_lock(&__scm->scm_bw_lock);
+       guard(mutex)(&__scm->scm_bw_lock);
+
        if (!__scm->scm_vote_count) {
                ret = icc_set_bw(__scm->path, 0, UINT_MAX);
                if (ret < 0) {
                        dev_err(__scm->dev, "failed to set bandwidth request\n");
-                       goto err_bw;
+                       return ret;
                }
        }
        __scm->scm_vote_count++;
-err_bw:
-       mutex_unlock(&__scm->scm_bw_lock);
 
-       return ret;
+       return 0;
 }
 
 static void qcom_scm_bw_disable(void)