]> git.hungrycats.org Git - linux/commitdiff
ASoC: qcom: Use auto-cleanup for firmware loading
authorTakashi Iwai <tiwai@suse.de>
Thu, 6 Aug 2026 14:00:00 +0000 (16:00 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 10 Aug 2026 14:34:15 +0000 (15:34 +0100)
Simplify the code to manage the firmware loading with __free(firmware)
auto-cleanup.

Only the code refactoring, no functional changes.

Cc: Srinivas Kandagatla <srini@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260806140006.1412298-29-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/qdsp6/topology.c

index 54661bcb006c907a641a9e35a0b19d61991c2ac3..faafbc5c0ad004b1a1aed1a3a1ad6a73762ebec1 100644 (file)
@@ -1416,7 +1416,6 @@ int audioreach_tplg_init(struct snd_soc_component *component)
 {
        struct snd_soc_card *card = component->card;
        struct device *dev = component->dev;
-       const struct firmware *fw;
        int ret;
 
        /* Inline with Qualcomm UCM configs and linux-firmware path */
@@ -1426,6 +1425,7 @@ int audioreach_tplg_init(struct snd_soc_component *component)
        if (!tplg_fw_name)
                return -ENOMEM;
 
+       const struct firmware *fw __free(firmware) = NULL;
        ret = request_firmware(&fw, tplg_fw_name, dev);
        if (ret < 0) {
                dev_err(dev, "tplg firmware loading %s failed %d\n", tplg_fw_name, ret);
@@ -1438,8 +1438,6 @@ int audioreach_tplg_init(struct snd_soc_component *component)
                        dev_err(dev, "tplg component load failed: %d\n", ret);
        }
 
-       release_firmware(fw);
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(audioreach_tplg_init);