ASoC: SOF: Intel: hda: use machine_check() for SoundWire

plbossart · bardliao · commit 2e6038a1d377 · 2024-10-15T18:57:06.000+08:00
Use the new machine_check() callback to select an alternate topology
for RT712-VB devices.

Signed-off-by: Pierre-Louis Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
@@ -1130,7 +1130,8 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
 		}
 		/* Found if all Slaves are checked */
 		if (i == hdev->info.count || !link->num_adr)
-			break;
+			if (!mach->machine_check || mach->machine_check(hdev->sdw))
+				break;
 	}
 	if (mach && mach->link_mask) {
 		mach->mach_params.links = mach->links;

Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,8 @@ static struct snd_soc_acpi_mach hda_sdw_machine_select(struct snd_sof_dev sdev`
`1130`	`1130`	`}`
`1131`	`1131`	`/* Found if all Slaves are checked */`
`1132`	`1132`	`if (i == hdev->info.count \|\| !link->num_adr)`
`1133`		`- break;`
	`1133`	`+ if (!mach->machine_check \|\| mach->machine_check(hdev->sdw))`
	`1134`	`+ break;`
`1134`	`1135`	`}`
`1135`	`1136`	`if (mach && mach->link_mask) {`
`1136`	`1137`	`mach->mach_params.links = mach->links;`