ASoC: wm_adsp: Simplify the logging of requested firmware files

This change makes the logging of firmware files more consistent and
simplifies the code - a debug message is logged whether the requested
file was found or not and this applies to both wmfw and bin files.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230320112245.115720-8-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 c23c306dc38dde34e3e39304d93182c39cabe925..216120b68b64bbd5ade25cff7705d8066a707148 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -787,6 +787,8 @@ static int wm_adsp_request_firmware_file(struct wm_adsp *dsp,
                adsp_dbg(dsp, "Failed to request '%s'\n", *filename);
                kfree(*filename);
                *filename = NULL;
+       } else {
+               adsp_dbg(dsp, "Found '%s'\n", *filename);
        }
 
        return ret;
@@ -807,7 +809,6 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
                if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,
                                                   cirrus_dir, system_name,
                                                   asoc_component_prefix, "wmfw")) {
-                       adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename);
                        wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
                                                      cirrus_dir, system_name,
                                                      asoc_component_prefix, "bin");
@@ -819,7 +820,6 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
                if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,
                                                   cirrus_dir, system_name,
                                                   NULL, "wmfw")) {
-                       adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename);
                        if (asoc_component_prefix)
                                wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
                                                              cirrus_dir, system_name,
@@ -835,7 +835,6 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
 
        if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,
                                           "", NULL, NULL, "wmfw")) {
-               adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename);
                wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
                                              "", NULL, NULL, "bin");
                return 0;
@@ -844,7 +843,6 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
        ret = wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,
                                            cirrus_dir, NULL, NULL, "wmfw");
        if (!ret) {
-               adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename);
                wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
                                              cirrus_dir, NULL, NULL, "bin");
                return 0;