ASoC: qcom: q6prm: Fix confusing cleanup.h syntax

Commit de8e95773c48 ("ASoc: qcom: q6prm: Use automatic cleanup of
kfree()") did not make the code simpler but more complicated.  Already
simple code of allocation and free, without any error paths, got now
declaration with one constructor followed by another allocation, which
is in contrary to explicit coding rules guiding cleanup.h:

"Given that the "__free(...) = NULL" pattern for variables defined at
the top of the function poses this potential interdependency problem the
recommendation is to always define and assign variables in one statement
and not group variable definitions at the top of the function when
__free() is used."

Code does not have a bug, but is less readable and uses discouraged
coding practice, so fix that by moving declaration to the place of
assignment.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20251129-asoc-wrong-cleanup-h-can-people-stop-sending-this-without-reading-docs-v1-1-c38b06884e39@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6prm.c b/sound/soc/qcom/qdsp6/q6prm.c
index 0b8fad0bc83242f814805ede3bee4e3fb4ade0db..2544c4519b2649364f4542a7024f54ec66cac893 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6prm.c
+++ b/sound/soc/qcom/qdsp6/q6prm.c
@@ -62,7 +62,6 @@ static int q6prm_set_hw_core_req(struct device *dev, uint32_t hw_block_id, bool
        struct prm_cmd_request_hw_core *req;
        gpr_device_t *gdev = prm->gdev;
        uint32_t opcode, rsp_opcode;
-       struct gpr_pkt *pkt __free(kfree) = NULL;
 
        if (enable) {
                opcode = PRM_CMD_REQUEST_HW_RSC;
@@ -72,7 +71,8 @@ static int q6prm_set_hw_core_req(struct device *dev, uint32_t hw_block_id, bool
                rsp_opcode = PRM_CMD_RSP_RELEASE_HW_RSC;
        }
 
-       pkt = audioreach_alloc_cmd_pkt(sizeof(*req), opcode, 0, gdev->svc.id, GPR_PRM_MODULE_IID);
+       struct gpr_pkt *pkt __free(kfree) =
+               audioreach_alloc_cmd_pkt(sizeof(*req), opcode, 0, gdev->svc.id, GPR_PRM_MODULE_IID);
        if (IS_ERR(pkt))
                return PTR_ERR(pkt);
 
@@ -111,10 +111,10 @@ static int q6prm_request_lpass_clock(struct device *dev, int clk_id, int clk_att
        struct apm_module_param_data *param_data;
        struct prm_cmd_request_rsc *req;
        gpr_device_t *gdev = prm->gdev;
-       struct gpr_pkt *pkt __free(kfree) = NULL;
 
-       pkt = audioreach_alloc_cmd_pkt(sizeof(*req), PRM_CMD_REQUEST_HW_RSC, 0, gdev->svc.id,
-                                      GPR_PRM_MODULE_IID);
+       struct gpr_pkt *pkt __free(kfree) =
+               audioreach_alloc_cmd_pkt(sizeof(*req), PRM_CMD_REQUEST_HW_RSC, 0,
+                                        gdev->svc.id, GPR_PRM_MODULE_IID);
        if (IS_ERR(pkt))
                return PTR_ERR(pkt);
 
@@ -143,10 +143,10 @@ static int q6prm_release_lpass_clock(struct device *dev, int clk_id, int clk_att
        struct apm_module_param_data *param_data;
        struct prm_cmd_release_rsc *rel;
        gpr_device_t *gdev = prm->gdev;
-       struct gpr_pkt *pkt __free(kfree) = NULL;
 
-       pkt = audioreach_alloc_cmd_pkt(sizeof(*rel), PRM_CMD_RELEASE_HW_RSC, 0, gdev->svc.id,
-                                      GPR_PRM_MODULE_IID);
+       struct gpr_pkt *pkt __free(kfree) =
+               audioreach_alloc_cmd_pkt(sizeof(*rel), PRM_CMD_RELEASE_HW_RSC, 0,
+                                        gdev->svc.id, GPR_PRM_MODULE_IID);
        if (IS_ERR(pkt))
                return PTR_ERR(pkt);