ASoC: SOF: Move sof_of_machine_select() to core.c from sof-of-dev.c
authorChen-Yu Tsai <wenst@chromium.org>
Mon, 4 Dec 2023 03:35:47 +0000 (11:35 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 4 Dec 2023 17:02:15 +0000 (17:02 +0000)
commitd0ae9dc48e24f5f704abcbb2dca3e4651bf0ff59
tree040d273bbd9da607fe5d2eb56467353b46857b52
parent4978d3f8e9e2fcc96142234b76131f7ee0a8c2e3
ASoC: SOF: Move sof_of_machine_select() to core.c from sof-of-dev.c

Commit 014fdeb0d747 ("ASoC: SOF: Move sof_of_machine_select() to
sof-of-dev.c from sof-audio.c") caused a circular dependency between
the snd_sof and snd_sof_of modules:

depmod: ERROR: Cycle detected: snd_sof -> snd_sof_of -> snd_sof
depmod: ERROR: Found 2 modules in dependency cycles!

Move the function back with sof_machine_select().

Fixes: 014fdeb0d747 ("ASoC: SOF: Move sof_of_machine_select() to sof-of-dev.c from sof-audio.c")
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20231204033549.2020289-1-wenst@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/core.c
sound/soc/sof/sof-of-dev.c
sound/soc/sof/sof-of-dev.h