Skip to contentSkip to conversation

ASoC: qcom: remove incorrect dependencies

PATCH Applied Arnd Bergmann 3 participants 4 messages May 21, 2015

Subsystems (4)
Sound Arm Qualcomm mailing list ASoC Qualcomm audio (ASoC) drivers
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ASoC: qcom: remove incorrect dependencies

Compile-tests show a warning for the newly added SND_SOC_STORM symbol:

warning: (SND_SOC_STORM) selects SND_SOC_LPASS_CPU which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && SND_SOC_QCOM)

The problem is that it can be selected for COMPILE_TEST on non-QCOM builds, but the symbols it selects have a dependency. Dropping the dependencies makes it work without warnings and no other side-effects, because these are not user-visible.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes f380dd3f3cd ("ASoC: qcom: Add ability to build QCOM drivers")
sound/soc/qcom/Kconfig +0 -2
index 5f58e4f1bca9..b07f183fc47f 100644
@@ -6,12 +6,10 @@ config SND_SOC_QCOM
 
 config SND_SOC_LPASS_CPU
 	tristate
-	depends on SND_SOC_QCOM
 	select REGMAP_MMIO
 
 config SND_SOC_LPASS_PLATFORM
 	tristate
-	depends on SND_SOC_QCOM
 	select REGMAP_MMIO
 
 config SND_SOC_STORM
maintainer Applied
#1 lore raw
Quoted 2 lines · Arnd Bergmann

Compile-tests show a warning for the newly added SND_SOC_STORM symbol:

Applied, thanks.

#2 lore raw
In reply to Arnd Bergmann
Quoted 18 lines · Arnd Bergmann

Compile-tests show a warning for the newly added SND_SOC_STORM symbol:

warning: (SND_SOC_STORM) selects SND_SOC_LPASS_CPU which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && SND_SOC_QCOM)

The problem is that it can be selected for COMPILE_TEST on non-QCOM builds, but the symbols it selects have a dependency. Dropping the dependencies makes it work without warnings and no other side-effects, because these are not user-visible.

Signed-off-by Arnd Bergmann <[email protected]>
Fixes f380dd3f3cd ("ASoC: qcom: Add ability to build QCOM drivers")
sound/soc/qcom/Kconfig +0 -0
index 5f58e4f1bca9..b07f183fc47f 100644

sound/soc/qcom/Kconfig config SND_SOC_QCOM · line 9

Quoted 4 lines
sound/soc/qcom/Kconfig +0 -1
@@ -6,12 +6,10 @@ config SND_SOC_QCOM
 
 config SND_SOC_LPASS_CPU
 	tristate
-	depends on SND_SOC_QCOM

Rather than remove the dependency (which I would like to keep), would the following change work for SND_SOC_LPASS_CPU and SND_SOC_LPASS_PLATFORM?
- depends on SND_SOC_QCOM
+ depends on SND_SOC_QCOM || COMPILE_TEST

If so, I will submit a patch (I know this has been applied already) on top of this one.

Quoted 9 lines
sound/soc/qcom/Kconfig +0 -1
 	select REGMAP_MMIO
 
 config SND_SOC_LPASS_PLATFORM
 	tristate
-	depends on SND_SOC_QCOM
 	select REGMAP_MMIO
 
 config SND_SOC_STORM
Signature · 4 lines
Kenneth Westfield
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, 
a Linux Foundation Collaborative Project
author
#3 lore raw
Quoted 16 lines · On Thursday 21 May 2015 14:00:00 Kenneth Westfield wrote:

sound/soc/qcom/Kconfig config SND_SOC_QCOM · line 9

Quoted 9 lines
sound/soc/qcom/Kconfig +0 -1
index 5f58e4f1bca9..b07f183fc47f 100644
@@ -6,12 +6,10 @@ config SND_SOC_QCOM
 
 config SND_SOC_LPASS_CPU
      tristate
-     depends on SND_SOC_QCOM

Rather than remove the dependency (which I would like to keep), would the following change work for SND_SOC_LPASS_CPU and SND_SOC_LPASS_PLATFORM?

(quoted diff) +1 -1
-       depends on SND_SOC_QCOM
+       depends on SND_SOC_QCOM || COMPILE_TEST
Quoted 3 lines

If so, I will submit a patch (I know this has been applied already) on top of this one.

That would have the same effect, but what is the point? Do you plan to make these options user-visible in the future?

Arnd