ASoC: SOF: Use auto-cleanup for firmware loading

Simplify the code to manage the firmware loading with __free(firmware)
and __free(kfree) auto-cleanups for the firmware data and the temporary
string or array.

Only the code refactoring, no functional changes.

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Bard Liao <yung-chuan.liao@linux.intel.com>
Cc: Daniel Baluta <daniel.baluta@nxp.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Cc: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260806140006.1412298-32-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/fw-file-profile.c b/sound/soc/sof/fw-file-profile.c
index 76bde2e0be1ddd75927d711f15be507e5d6fa698..fcd57f04ca36d6dccfdf2a7268383f63d47b18a2 100644 (file)
--- a/sound/soc/sof/fw-file-profile.c
+++ b/sound/soc/sof/fw-file-profile.c
@@ -16,20 +16,19 @@ static int sof_test_firmware_file(struct device *dev,
                                  enum sof_ipc_type *ipc_type_to_adjust)
 {
        enum sof_ipc_type fw_ipc_type;
-       const struct firmware *fw;
-       const char *fw_filename;
        const u32 *magic;
        int ret;
 
-       fw_filename = kasprintf(GFP_KERNEL, "%s/%s", profile->fw_path,
-                               profile->fw_name);
+       const char *fw_filename __free(kfree) =
+               kasprintf(GFP_KERNEL, "%s/%s", profile->fw_path,
+                         profile->fw_name);
        if (!fw_filename)
                return -ENOMEM;
 
+       const struct firmware *fw __free(firmware) = NULL;
        ret = firmware_request_nowarn(&fw, fw_filename, dev);
        if (ret < 0) {
                dev_dbg(dev, "Failed to open firmware file: %s\n", fw_filename);
-               kfree(fw_filename);
                return ret;
        }
 
@@ -44,8 +43,7 @@ static int sof_test_firmware_file(struct device *dev,
                break;
        default:
                dev_err(dev, "Invalid firmware magic: %#x\n", *magic);
-               ret = -EINVAL;
-               goto out;
+               return -EINVAL;
        }
 
        if (ipc_type_to_adjust) {
@@ -54,13 +52,10 @@ static int sof_test_firmware_file(struct device *dev,
                dev_err(dev,
                        "ipc type mismatch between %s and expected: %d vs %d\n",
                        fw_filename, fw_ipc_type, profile->ipc_type);
-               ret = -EINVAL;
+               return -EINVAL;
        }
-out:
-       release_firmware(fw);
-       kfree(fw_filename);
 
-       return ret;
+       return 0;
 }
 
 static int sof_test_topology_file(struct device *dev,

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 6fd69ba11c410663e2c692381632518674ff0fb6..820513bb257714db36ec5b98338cdfccaaab1c2d 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -2506,13 +2506,12 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
        struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
        struct snd_sof_pdata *sof_pdata = sdev->pdata;
        const char *tplg_filename_prefix = sof_pdata->tplg_filename_prefix;
-       const struct firmware *fw;
-       const char **tplg_files;
        int tplg_cnt = 0;
        int ret;
        int i;
 
-       tplg_files = kcalloc(scomp->card->num_links, sizeof(char *), GFP_KERNEL);
+       const char **tplg_files __free(kfree) =
+               kcalloc(scomp->card->num_links, sizeof(char *), GFP_KERNEL);
        if (!tplg_files)
                return -ENOMEM;
 
@@ -2538,10 +2537,8 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
                                                                       tplg_filename_prefix,
                                                                       &tplg_files,
                                                                       no_fallback);
-               if (tplg_cnt < 0) {
-                       kfree(tplg_files);
+               if (tplg_cnt < 0)
                        return tplg_cnt;
-               }
        }
 
        /*
@@ -2552,8 +2549,6 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
                if (strstr(file, "dummy")) {
                        dev_err(scomp->dev,
                                "Function topology is required, please upgrade sof-firmware\n");
-
-                       kfree(tplg_files);
                        return -EINVAL;
                }
                tplg_files[0] = file;
@@ -2568,6 +2563,7 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
                if (tplg_files[0] != file)
                        dev_info(scomp->dev, "loading topology %d: %s\n", i, tplg_files[i]);
 
+               const struct firmware *fw __free(firmware) = NULL;
                ret = request_firmware(&fw, tplg_files[i], scomp->dev);
                if (ret < 0) {
                        /*
@@ -2586,8 +2582,6 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
                else
                        ret = snd_soc_tplg_component_load(scomp, &sof_tplg_ops, fw);
 
-               release_firmware(fw);
-
                if (ret < 0) {
                        dev_err(scomp->dev, "tplg %s component load failed %d\n",
                                tplg_files[i], ret);
@@ -2606,6 +2600,8 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
                        goto out;
                }
                dev_info(scomp->dev, "loading feature topology %d: %s\n", i, feature_topology);
+
+               const struct firmware *fw __free(firmware) = NULL;
                ret = request_firmware(&fw, feature_topology, scomp->dev);
                if (ret < 0) {
                        /*
@@ -2630,8 +2626,6 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
                else
                        ret = snd_soc_tplg_component_load(scomp, &sof_tplg_ops, fw);
 
-               release_firmware(fw);
-
                if (ret < 0) {
                        dev_err(scomp->dev, "feature tplg %s component load failed %d\n",
                                feature_topologies[i], ret);
@@ -2650,8 +2644,6 @@ out:
        if (ret >= 0 && sdev->led_present)
                ret = snd_ctl_led_request();
 
-       kfree(tplg_files);
-
        return ret;
 }
 EXPORT_SYMBOL(snd_sof_load_topology);