From 08040182fdc79579f4f4357c383151e513c71a07 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Tue, 7 Oct 2025 20:36:15 +0800 Subject: [PATCH 1/3] fixup! ASoC: SOF: Don't print the monolithic topology name if function topology may be used Fix checkpatch error Signed-off-by: Bard Liao --- sound/soc/sof/fw-file-profile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/fw-file-profile.c b/sound/soc/sof/fw-file-profile.c index 0b6d071f1269dc..4a2afc04f3380e 100644 --- a/sound/soc/sof/fw-file-profile.c +++ b/sound/soc/sof/fw-file-profile.c @@ -288,10 +288,11 @@ 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); - if(plat_data->machine->get_function_tplg_files && !plat_data->disable_function_topology) + 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); + 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, From b2cbf7dc2379b7ee76bd8e668fab802672710b99 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Tue, 7 Oct 2025 20:41:37 +0800 Subject: [PATCH 2/3] fixup! ASoC: SOF: Intel: use sof_sdw as default SDW machine driver fix checkpatch error. Signed-off-by: Bard Liao --- sound/soc/sof/intel/hda.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index cd723a9884ecaf..7d77a8ba4cd7f3 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -1178,10 +1178,8 @@ static struct snd_soc_acpi_adr_device *find_acpi_adr_device(struct device *dev, endpoints = devm_kcalloc(dev, codec_info_list[i].dai_num, sizeof(struct snd_soc_acpi_endpoint), GFP_KERNEL); - if (!endpoints) { - dev_err(dev, "failed to allocate memory for endpoints\n"); + if (!endpoints) return NULL; - } name_prefix = codec_info_list[i].name_prefix; /* @@ -1413,7 +1411,8 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev * Set mach->sof_tplg_filename as a dummy topology to avoid tplg file checking * and being used. */ - mach->sof_tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL, "sof-%s-dummy.tplg", chip->platform); + mach->sof_tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL, + "sof-%s-dummy.tplg", chip->platform); dev_info(sdev->dev, "Use SoundWire default machine driver with function topologies\n"); return mach; From bd91d03a45fddaf0f8976545acea3fd787f24fcc Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Tue, 7 Oct 2025 20:43:35 +0800 Subject: [PATCH 3/3] fixup! ASoC: sof-function-topology-lib: escalate the log when missing function topoplogy fix checkpatch error Signed-off-by: Bard Liao --- sound/soc/intel/common/sof-function-topology-lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/common/sof-function-topology-lib.c b/sound/soc/intel/common/sof-function-topology-lib.c index 27adbad355940a..b10d4794159a48 100644 --- a/sound/soc/intel/common/sof-function-topology-lib.c +++ b/sound/soc/intel/common/sof-function-topology-lib.c @@ -130,7 +130,7 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_ "Failed to open topology file: %s, you might need to\n", (*tplg_files)[i]); dev_warn(card->dev, - "download it from https://github.com/thesofproject/sof-bin/\n"); + "download it from https://github.com/thesofproject/sof-bin/\n"); return 0; } }