ASoC: wm_adsp: Combine some similar code in firmware file search

In wm_adsp_request_firmware_files() squash the if (system_name && suffix)
and the following if (system_name) blocks together. This removes some
duplicated code.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20260310141817.1871794-11-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index bcc77797c09ab807de032682c94c3f2a6f703887..a5fa0db250f2d39dce7d42242fb5f47c1b19d47c 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -804,47 +804,42 @@ VISIBLE_IF_KUNIT int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
 {
        const char *system_name = dsp->system_name;
        const char *suffix = dsp->component->name_prefix;
+       bool require_bin_suffix = false;
        int ret = 0;
 
        if (dsp->fwf_suffix)
                suffix = dsp->fwf_suffix;
 
-       if (system_name && suffix) {
+       if (system_name) {
                ret = wm_adsp_request_firmware_file(dsp, &fw->wmfw,
                                                    cirrus_dir, system_name,
                                                    suffix, "wmfw");
                if (ret < 0)
                        goto err;
 
-               if (fw->wmfw.firmware) {
+               if (suffix) {
+                       if (fw->wmfw.firmware) {
+                               require_bin_suffix = true;
+                       } else {
+                               /* Fallback to name without suffix */
+                               ret = wm_adsp_request_firmware_file(dsp, &fw->wmfw,
+                                                                   cirrus_dir, system_name,
+                                                                   NULL, "wmfw");
+                               if (ret < 0)
+                                       goto err;
+                       }
+               }
+
+               /* Look for matching .bin file */
+               if (fw->wmfw.firmware || dsp->wmfw_optional) {
                        ret = wm_adsp_request_firmware_file(dsp, &fw->coeff,
                                                            cirrus_dir, system_name,
                                                            suffix, "bin");
                        if (ret < 0)
                                goto err;
 
-                       return 0;
-               }
-       }
-
-       if (system_name) {
-               ret = wm_adsp_request_firmware_file(dsp, &fw->wmfw,
-                                                   cirrus_dir, system_name,
-                                                   NULL, "wmfw");
-               if (ret < 0)
-                       goto err;
-
-               if (fw->wmfw.firmware || dsp->wmfw_optional) {
-                       if (suffix) {
-                               ret = wm_adsp_request_firmware_file(dsp,
-                                                                   &fw->coeff,
-                                                                   cirrus_dir, system_name,
-                                                                   suffix, "bin");
-                               if (ret < 0)
-                                       goto err;
-                       }
-
-                       if (!fw->coeff.firmware) {
+                       if (suffix && !fw->coeff.firmware && !require_bin_suffix) {
+                               /* Fallback to name without suffix */
                                ret = wm_adsp_request_firmware_file(dsp,
                                                                    &fw->coeff,
                                                                    cirrus_dir, system_name,
@@ -852,10 +847,10 @@ VISIBLE_IF_KUNIT int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
                                if (ret < 0)
                                        goto err;
                        }
-
-                       if (fw->wmfw.firmware || (dsp->wmfw_optional && fw->coeff.firmware))
-                               return 0;
                }
+
+               if (fw->wmfw.firmware || (dsp->wmfw_optional && fw->coeff.firmware))
+                       return 0;
        }
 
        /* Check legacy location */