On Tue, Nov 19, 2024 at 7:38 PM Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> wrote: > > Only part of the __scm_smc_call() function uses 'mempool' variable, so > narrow the scope to make it more readable. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> > --- > drivers/firmware/qcom/qcom_scm-smc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/firmware/qcom/qcom_scm-smc.c b/drivers/firmware/qcom/qcom_scm-smc.c > index 3f10b23ec941b558e1d91761011776bb5c9d11b5..574930729ddd72d98013770da97cc018a52554ff 100644 > --- a/drivers/firmware/qcom/qcom_scm-smc.c > +++ b/drivers/firmware/qcom/qcom_scm-smc.c > @@ -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; > > > -- > 2.43.0 > > Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>