firmware: cs_dsp: Don't use __free() in cs_dsp_load() and cs_dsp_load_coeff()

Replace the __free(kfree) in cs_dsp_load() and cs_dsp_load_coeff() with
a kfree(buf) at the end of the function.

The use of __free() can create new cleanup bugs that are difficult to spot
because the defective code is idiomatically correct regular C. In these two
functions the __free() was mixed with gotos, and also used the suspect
declaration __free(kfree) = NULL;.

The __free() did not do anything to simplify the code. There aren't any
early returns after the pointer is set, and the __free() can be replaced by
a kfree() at the end of the function.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 900baa6e7bb0 ("firmware: cs_dsp: Remove redundant download buffer allocator")
Link: https://patch.msgid.link/20251201160729.231867-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c
index 8d2e7267d973db8e36deb32cdc2b78e4e9de0dc5..d35d0f5ccaf7b5eb98a80ee49198fde56e4a53f4 100644 (file)
--- a/drivers/firmware/cirrus/cs_dsp.c
+++ b/drivers/firmware/cirrus/cs_dsp.c
@@ -1451,7 +1451,7 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware,
        const struct wmfw_region *region;
        const struct cs_dsp_region *mem;
        const char *region_name;
-       u8 *buf __free(kfree) = NULL;
+       u8 *buf = NULL;
        size_t buf_len = 0;
        size_t region_len;
        unsigned int reg;
@@ -1606,6 +1606,8 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware,
 
        ret = 0;
 out_fw:
+       kfree(buf);
+
        if (ret == -EOVERFLOW)
                cs_dsp_err(dsp, "%s: file content overflows file data\n", file);
 
@@ -2137,7 +2139,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware
        struct cs_dsp_alg_region *alg_region;
        const char *region_name;
        int ret, pos, blocks, type, offset, reg, version;
-       u8 *buf __free(kfree) = NULL;
+       u8 *buf = NULL;
        size_t buf_len = 0;
        size_t region_len;
 
@@ -2316,6 +2318,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware
 
        ret = 0;
 out_fw:
+       kfree(buf);
+
        if (ret == -EOVERFLOW)
                cs_dsp_err(dsp, "%s: file content overflows file data\n", file);