Skip to contentSkip to conversation

Revert "ASoC: Fix build dependency for SND_ATMEL_SOC_SSC"

PATCH In review Axel Lin 2 participants 5 messages Jan 9, 2012

Subsystems (4)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 Revert "ASoC: Fix build dependency for SND_ATMEL_SOC_SSC"

This reverts commit 739be96ab83755e10fd0c2b6a34c8a73254527f7 because it introduces below build warnings:

drivers/misc/Kconfig:212:error: recursive dependency detected!

drivers/misc/Kconfig:212:       symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC
sound/soc/atmel/Kconfig:9:      symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731
sound/soc/atmel/Kconfig:18:     symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC
---
 sound/soc/atmel/Kconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/atmel/Kconfig +0 -1
index a4d6742..d1fcc81 100644
@@ -9,7 +9,6 @@ config SND_ATMEL_SOC
 config SND_ATMEL_SOC_SSC
 	tristate
 	depends on SND_ATMEL_SOC
-	select ATMEL_SSC
 	help
 	  Say Y or M if you want to add support for codecs the
 	  ATMEL SSC interface. You will also needs to select the individual
Signature · 1 line
1.7.5.4
#1 lore raw

sound/soc/atmel/Kconfig config SND_ATMEL_SOC · line 12

Quoted 11 lines · Axel Lin

This reverts commit 739be96ab83755e10fd0c2b6a34c8a73254527f7 because it introduces below build warnings:

drivers/misc/Kconfig:212:       symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC
sound/soc/atmel/Kconfig:9:      symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731
sound/soc/atmel/Kconfig:18:     symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC

config SND_ATMEL_SOC_SSC

sound/soc/atmel/Kconfig +0 -1
 	tristate
 	depends on SND_ATMEL_SOC
-	select ATMEL_SSC

Why is this the best fix? It's not obvious to me that the dependency from the machine driver to the ATMEL_SSC (rather than a select or relying on the SSC driver sorting things out) is correct.

author
#2 lore raw

2012/1/9 Mark Brown <[email protected]>:

Quoted 8 lines · Axel Lin
Quoted 6 lines

This reverts commit 739be96ab83755e10fd0c2b6a34c8a73254527f7 because it introduces below build warnings:

drivers/misc/Kconfig:212:       symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC sound/soc/atmel/Kconfig:9:      symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731 sound/soc/atmel/Kconfig:18:     symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC

Quoted 8 lines
Quoted 4 lines

 config SND_ATMEL_SOC_SSC
      tristate
      depends on SND_ATMEL_SOC
-     select ATMEL_SSC

Why is this the best fix?  It's not obvious to me that the dependency from the machine driver to the ATMEL_SSC (rather than a select or relying on the SSC driver sorting things out) is correct.

The issue is that SND_ATMEL_SOC_SSC needs ATMEL_SSC to pass compilation. We now got the build warnings as Stephen points out.
So I revert the patch.
Both SND_AT91_SOC_SAM9G20_WM8731 and SND_AT91_SOC_AFEB9260 selects SND_ATMEL_SOC_SSC.
Thus we need to make both machine drivers depend on ATMEL_SSC.

I think this patch reverts the problematic patch. And then you can apply [PATCH] ASoC: Fix build dependency for SND_AT91_SOC_AFEB9260 (
http://mailman.alsa-project.org/pipermail/alsa-devel/2012-January/047861.html
)

author
#4 lore raw

2012/1/9 Mark Brown <[email protected]>:

Quoted 10 lines · Axel Lin
Quoted 6 lines

I think this patch reverts the problematic patch. And then you can apply [PATCH] ASoC: Fix build dependency for SND_AT91_SOC_AFEB9260 (
http://mailman.alsa-project.org/pipermail/alsa-devel/2012-January/047861.html
)

What I asked for here was a patch which brings the tree to the desired state.  Clearly I can just run git revert myself if I want to...

I misunderstand what you mean.
Now a new patch is on the way.

Thanks,
Axel