[2/2] ASoC: Intel: Kconfig: select SND_SOC_SDCA by SND_SOC_ACPI_INTEL_SDCA_QUIRKS

Commit Message

Bard Liao Nov. 6, 2024, 5:58 a.m. UTC

SND_SOC_SDCA can't be optional when SND_SOC_ACPI_INTEL_SDCA_QUIRKS is
selected. IS_REACHABLE can prevent the link error. However it is not
suitable for this case. When CONFIG_SND_SOC_ACPI_INTEL_SDCA_QUIRKS is
Y and CONFIG_SND_SOC_SDCA is M, the SDCA helpers will be empty and
return false. But we need the helpers to do their jobs whenSND_SOC_SDCA
is M.
IOW, the SDCA library is not optional for Intel platforms where the
SDCA_QUIRK is selected.
Also, make SND_SOC_SDCA invisible. SND_SOC_SDCA should be selected if
a device supports SDCA. User should not unselect it.

Reported-by: kernel test robot <[e-mail]>
Closes: https://lore.kernel.org/oe-kbuild-all/[e-mail]/
Suggested-by: Peter Ujfalusi <[e-mail]>
Signed-off-by: Bard Liao <[e-mail]>
Reviewed-by: Péter Ujfalusi <[e-mail]>
Reviewed-by: Liam Girdwood <[e-mail]>
Reviewed-by: Ranjani Sridharan <[e-mail]>
---
 sound/soc/intel/Kconfig | 2 +-
 sound/soc/sdca/Kconfig  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index f644e9423428..46b45f390ae9 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -78,7 +78,7 @@  config SND_SOC_ACPI_INTEL_MATCH
 
 config SND_SOC_ACPI_INTEL_SDCA_QUIRKS
 	tristate
-	imply SND_SOC_SDCA
+	select SND_SOC_SDCA
 
 endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL
 
diff --git a/sound/soc/sdca/Kconfig b/sound/soc/sdca/Kconfig
index 07f6822fa614..ee20b9914aa1 100644
--- a/sound/soc/sdca/Kconfig
+++ b/sound/soc/sdca/Kconfig
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 
 config SND_SOC_SDCA
-	tristate "ASoC SDCA library"
+	tristate
 	depends on ACPI
 	help
 	  This option enables support for the MIPI SoundWire Device