]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
firmware: qcom: scm: smc: Narrow 'mempool' variable scope
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 9 Dec 2024 14:27:59 +0000 (15:27 +0100)
committerBjorn Andersson <andersson@kernel.org>
Tue, 7 Jan 2025 00:36:59 +0000 (18:36 -0600)
Only part of the __scm_smc_call() function uses 'mempool' variable, so
narrow the scope to make it more readable.

Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241209-qcom-scm-missing-barriers-and-all-sort-of-srap-v2-6-9061013c8d92@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/firmware/qcom/qcom_scm-smc.c

index 3f10b23ec941b558e1d91761011776bb5c9d11b5..574930729ddd72d98013770da97cc018a52554ff 100644 (file)
@@ -152,7 +152,6 @@ int __scm_smc_call(struct device *dev, const struct qcom_scm_desc *desc,
                   enum qcom_scm_convention qcom_convention,
                   struct qcom_scm_res *res, bool atomic)
 {
-       struct qcom_tzmem_pool *mempool = qcom_scm_get_tzmem_pool();
        int arglen = desc->arginfo & 0xf;
        int i, ret;
        void *args_virt __free(qcom_tzmem) = NULL;
@@ -173,6 +172,8 @@ int __scm_smc_call(struct device *dev, const struct qcom_scm_desc *desc,
                smc.args[i + SCM_SMC_FIRST_REG_IDX] = desc->args[i];
 
        if (unlikely(arglen > SCM_SMC_N_REG_ARGS)) {
+               struct qcom_tzmem_pool *mempool = qcom_scm_get_tzmem_pool();
+
                if (!mempool)
                        return -EINVAL;