ASoC: amd: acp-sdw-sof: Fix confusing cleanup.h syntax

Initializing automatic __free variables to NULL without need (e.g.
branches with different allocations), followed by actual allocation 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>
Link: https://patch.msgid.link/20251203-asoc-wrong-cleanup-h-continued-v1-2-5142be4874fb@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c
index 5677ae63fca921c470aa7d8dc3aa6cbc59bf3e91..da815b3f6389a80e2ac85ff8c61a20fc36a85836 100644 (file)
--- a/sound/soc/amd/acp/acp-sdw-sof-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c
@@ -270,8 +270,6 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
        int sdw_be_num = 0, dmic_num = 0;
        struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
        struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
-       struct asoc_sdw_endpoint *sof_ends __free(kfree) = NULL;
-       struct asoc_sdw_dailink *sof_dais __free(kfree) = NULL;
        struct snd_soc_aux_dev *sof_aux;
        struct snd_soc_codec_conf *codec_conf;
        struct snd_soc_dai_link *dai_links;
@@ -289,12 +287,14 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
        }
 
        /* One per DAI link, worst case is a DAI link for every endpoint */
-       sof_dais = kcalloc(num_ends, sizeof(*sof_dais), GFP_KERNEL);
+       struct asoc_sdw_dailink *sof_dais __free(kfree) =
+               kcalloc(num_ends, sizeof(*sof_dais), GFP_KERNEL);
        if (!sof_dais)
                return -ENOMEM;
 
        /* One per endpoint, ie. each DAI on each codec/amp */
-       sof_ends = kcalloc(num_ends, sizeof(*sof_ends), GFP_KERNEL);
+       struct asoc_sdw_endpoint *sof_ends __free(kfree) =
+               kcalloc(num_ends, sizeof(*sof_ends), GFP_KERNEL);
        if (!sof_ends)
                return -ENOMEM;