diff mbox series

[v2] ASoC: Intel: boards: Fix CONFIG_SND_SOC_SDW_MOCKUP select

Message ID 20210802212409.3207648-1-nathan@kernel.org (mailing list archive)
State New, archived
Headers show
Series [v2] ASoC: Intel: boards: Fix CONFIG_SND_SOC_SDW_MOCKUP select | expand

Commit Message

Nathan Chancellor Aug. 2, 2021, 9:24 p.m. UTC 
When CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is enabled without
CONFIG_EXPERT, there is a Kconfig warning about unmet dependencies:

WARNING: unmet direct dependencies detected for SND_SOC_SDW_MOCKUP
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] &&
EXPERT [=n] && SOUNDWIRE [=y]
  Selected by [y]:
  - SND_SOC_INTEL_SOUNDWIRE_SOF_MACH [=y] && ...

Selecting a symbol does not account for dependencies. There are three
ways to resolve this:

1. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select
   CONFIG_SND_SOC_SDW_MOCKUP only if CONFIG_EXPERT is set.

2. Make CONFIG_SND_SOC_SDW_MOCKUP's prompt depend on CONFIG_EXPERT so
   that it can be selected by options that only depend on
   CONFIG_SOUNDWIRE but still appear as a prompt to the user when
   CONFIG_EXPERT is set.

3. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH imply
   CONFIG_SND_SOC_SDW_MOCKUP, which will select
   CONFIG_SND_SOC_SDW_MOCKUP when its dependencies are enabled but still
   allow the user to disable it.

Go with the third option as it gives the most flexibility while
retaining the original intent of the select.

Fixes: 0ccac3bcf356 ("ASoC: Intel: boards: sof_sdw: add SoundWire mockup codecs for tests")
Suggested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---

v1 -> v2:

* Switch to imply rather than select ... if ... (Pierre-Louis).

* Reword commit message to explain different solutions rather than
  explain the problem in depth.

 sound/soc/intel/boards/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 170c0d7460fc4aa522995ae4096b5a442f50a1fc

Comments

Pierre-Louis Bossart Sept. 2, 2021, 3:02 p.m. UTC | #1 
On 8/2/21 4:24 PM, Nathan Chancellor wrote:
> When CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is enabled without
> CONFIG_EXPERT, there is a Kconfig warning about unmet dependencies:
> 
> WARNING: unmet direct dependencies detected for SND_SOC_SDW_MOCKUP
>   Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] &&
> EXPERT [=n] && SOUNDWIRE [=y]
>   Selected by [y]:
>   - SND_SOC_INTEL_SOUNDWIRE_SOF_MACH [=y] && ...
> 
> Selecting a symbol does not account for dependencies. There are three
> ways to resolve this:
> 
> 1. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select
>    CONFIG_SND_SOC_SDW_MOCKUP only if CONFIG_EXPERT is set.
> 
> 2. Make CONFIG_SND_SOC_SDW_MOCKUP's prompt depend on CONFIG_EXPERT so
>    that it can be selected by options that only depend on
>    CONFIG_SOUNDWIRE but still appear as a prompt to the user when
>    CONFIG_EXPERT is set.
> 
> 3. Make CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH imply
>    CONFIG_SND_SOC_SDW_MOCKUP, which will select
>    CONFIG_SND_SOC_SDW_MOCKUP when its dependencies are enabled but still
>    allow the user to disable it.
> 
> Go with the third option as it gives the most flexibility while
> retaining the original intent of the select.
> 
> Fixes: 0ccac3bcf356 ("ASoC: Intel: boards: sof_sdw: add SoundWire mockup codecs for tests")
> Suggested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>

This patch was missed, maybe because I didn't provide a formal ack on my
own suggestion, so here goes:

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Mark, can you add it to 5.15 fixes please? Thank you.
-Pierre
Mark Brown Sept. 2, 2021, 3:24 p.m. UTC | #2 
On Thu, Sep 02, 2021 at 10:02:18AM -0500, Pierre-Louis Bossart wrote:
> On 8/2/21 4:24 PM, Nathan Chancellor wrote:
> > When CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is enabled without
> > CONFIG_EXPERT, there is a Kconfig warning about unmet dependencies:

> > Signed-off-by: Nathan Chancellor <nathan@kernel.org>

> This patch was missed, maybe because I didn't provide a formal ack on my
> own suggestion, so here goes:

> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

It looks like this was sent in reply to an old thread so got deleted
along with the old thread.  In any case I don't have it any more...
diff mbox series

Patch

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 046955bf717c..61b71d6c44cf 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -602,7 +602,7 @@  config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
 	select SND_SOC_DMIC
 	select SND_SOC_INTEL_HDA_DSP_COMMON
 	select SND_SOC_INTEL_SOF_MAXIM_COMMON
-	select SND_SOC_SDW_MOCKUP
+	imply SND_SOC_SDW_MOCKUP
 	help
 	  Add support for Intel SoundWire-based platforms connected to
 	  MAX98373, RT700, RT711, RT1308 and RT715