archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 08:04:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: SOF: Don't print the monolithic topology name if function topology may be used

Browse source 
It may confuse people if "Topology file:" is printed but the topology
file is not really used. We keep the print if the topology file is
missing thus user can know what topology is missed in the file system.
And increase the log level to info for the actual topology that is used.
So that user can get which topology is used.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Simon Trimmer <simont@opensource.cirrus.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20251009094023.3474895-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bard Liao 2025-10-09 17:40:15 +08:00 • committed by Mark Brown
parent 3a86608788
commit 2b92b98cc4
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/sof/fw-file-profile.c
View file

@ -266,6 +266,7 @@ static void sof_print_profile_info(struct snd_sof_dev *sdev,
enum sof_ipc_type ipc_type,
struct sof_loadable_file_profile *profile)
{
struct snd_sof_pdata *plat_data = sdev->pdata;
struct device *dev = sdev->dev;
if (ipc_type != profile->ipc_type)
@ -282,7 +283,12 @@ static void sof_print_profile_info(struct snd_sof_dev *sdev,
if (profile->fw_lib_path)
dev_info(dev, " Firmware lib path: %s\n", profile->fw_lib_path);
dev_info(dev, " Topology file: %s/%s\n", profile->tplg_path, profile->tplg_name);
if (plat_data->machine->get_function_tplg_files && !plat_data->disable_function_topology)
dev_info(dev, " Topology file: function topologies\n");
else
dev_info(dev, " Topology file: %s/%s\n",
profile->tplg_path, profile->tplg_name);
}
int sof_create_ipc_file_profile(struct snd_sof_dev *sdev,

2
sound/soc/sof/topology.c
View file

@ -2525,7 +2525,7 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
if (!tplg_cnt) {
tplg_files[0] = file;
tplg_cnt = 1;
dev_dbg(scomp->dev, "loading topology: %s\n", file);
dev_info(scomp->dev, "loading topology: %s\n", file);
} else {
dev_info(scomp->dev, "Using function topologies instead %s\n", file);
}