Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Simon Trimmer and committed by
Mark Brown
991b1de8 0e7d82cb

+2 -4
+2 -4
sound/soc/codecs/wm_adsp.c
··· 787 787 adsp_dbg(dsp, "Failed to request '%s'\n", *filename); 788 788 kfree(*filename); 789 789 *filename = NULL; 790 + } else { 791 + adsp_dbg(dsp, "Found '%s'\n", *filename); 790 792 } 791 793 792 794 return ret; ··· 809 807 if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename, 810 808 cirrus_dir, system_name, 811 809 asoc_component_prefix, "wmfw")) { 812 - adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename); 813 810 wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename, 814 811 cirrus_dir, system_name, 815 812 asoc_component_prefix, "bin"); ··· 820 819 if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename, 821 820 cirrus_dir, system_name, 822 821 NULL, "wmfw")) { 823 - adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename); 824 822 if (asoc_component_prefix) 825 823 wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename, 826 824 cirrus_dir, system_name, ··· 835 835 836 836 if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename, 837 837 "", NULL, NULL, "wmfw")) { 838 - adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename); 839 838 wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename, 840 839 "", NULL, NULL, "bin"); 841 840 return 0; ··· 843 844 ret = wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename, 844 845 cirrus_dir, NULL, NULL, "wmfw"); 845 846 if (!ret) { 846 - adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename); 847 847 wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename, 848 848 cirrus_dir, NULL, NULL, "bin"); 849 849 return 0;