[SRU][Q][PATCH 07/10] ASoC: amd: acp: Fix Kconfig dependencies for SND_SOC_ACPI_AMD_SDCA_QUIRKS

[Chris Chiu]

From: Syed Saba Kareem <syed.sabakareem at amd.com>

BugLink: https://bugs.launchpad.net/bugs/2143104

Fix the following kconfig warning reported by the kernel test robot:

  kismet: WARNING: unmet direct dependencies detected for
  SND_SOC_ACPI_AMD_SDCA_QUIRKS when selected by SND_SOC_ACPI_AMD_MATCH
    Depends on [n]: SOUND [=y] && SND [=y] && SND_SOC [=y] &&
                     ACPI [=y] && SND_SOC_SDCA [=n]
    Selected by [y]:
    - SND_SOC_ACPI_AMD_MATCH [=y] && SOUND [=y] && SND [=y] &&
      SND_SOC [=y]

The issue occurs because SND_SOC_ACPI_AMD_SDCA_QUIRKS depends on
SND_SOC_SDCA, which may be disabled, causing unmet dependency warnings.
Fix this by adjusting the Kconfig dependency logic accordingly.

Fixes: e7c30ac379b4 ("ASoC: amd: acp: soc-acpi: add is_device_rt712_vb() helper")
Reported-by: kernel test robot <lkp at intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202601131155.RXGj4KHv-lkp@intel.com
Signed-off-by: Syed Saba Kareem <syed.sabakareem at amd.com>
Link: https://patch.msgid.link/20260123095524.490655-1-syed.sabakareem@amd.com
Signed-off-by: Mark Brown <broonie at kernel.org>
(cherry picked from commit 10d366a846be648aa47cdcd3dc7b7346a4143a6c)
Signed-off-by: Chris Chiu <chris.chiu at canonical.com>
---
 sound/soc/amd/acp/Kconfig                    |  4 ++--
 sound/soc/amd/acp/amd-acp70-acpi-match.c     |  2 ++
 sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h | 11 +++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig
index ed2fa055f7f6..8738b6f394f1 100644
--- a/sound/soc/amd/acp/Kconfig
+++ b/sound/soc/amd/acp/Kconfig
@@ -15,8 +15,8 @@ config SND_SOC_AMD_ACP_COMMON
 
 config SND_SOC_ACPI_AMD_MATCH
 	tristate
-	select SND_SOC_ACPI_AMD_SDCA_QUIRKS
-	select SND_SOC_ACPI if ACPI
+        select SND_SOC_ACPI_AMD_SDCA_QUIRKS if SND_SOC_SDCA
+        select SND_SOC_ACPI if ACPI
 
 config SND_SOC_ACPI_AMD_SDCA_QUIRKS
 	tristate
diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c
index 0721fc83e27a..dd2b010efdaa 100644
--- a/sound/soc/amd/acp/amd-acp70-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c
@@ -632,4 +632,6 @@ EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sof_sdw_machines);
 MODULE_DESCRIPTION("AMD ACP7.0 & ACP7.1 tables and support for ACPI enumeration");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Vijendar.Mukunda at amd.com");
+#if IS_ENABLED(CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS)
 MODULE_IMPORT_NS("SND_SOC_ACPI_AMD_SDCA_QUIRKS");
+#endif
diff --git a/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h b/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h
index 7e345a236da1..0e644e71e76f 100644
--- a/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h
+++ b/sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h
@@ -9,6 +9,17 @@
 #ifndef _SND_SOC_ACPI_AMD_SDCA_QUIRKS
 #define _SND_SOC_ACPI_AMD_SDCA_QUIRKS
 
+#if IS_ENABLED(CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS)
+
 bool snd_soc_acpi_amd_sdca_is_device_rt712_vb(void *arg);
 
+#else
+
+static inline bool snd_soc_acpi_amd_sdca_is_device_rt712_vb(void *arg)
+{
+	return false;
+}
+
+#endif
+
 #endif
-- 
2.43.0