[PATCH 3/3] firmware: qcom: scom: Simplify mutex with guard

From: Krzysztof Kozlowski

Date: Sun Feb 15 2026 - 06:06:46 EST


Simplify error path unlocking mutex with the guard.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxxxxx>
---
drivers/firmware/qcom/qcom_scm.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 8fbc96693a55..f1947025d8b5 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -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)
--
2.51.0