2021-09-01 16:44:11

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH] ASoC: ti: rename CONFIG_SND_SOC_DM365_VOICE_CODEC_MODULE

Kconfig generates include/generated/autoconf.h to make CONFIG options
available to the pre-processor. Symbols with the value 'm' are suffixed
with '_MODULE'

Here is a conflict; CONFIG_FOO=m results in '#define CONFIG_FOO_MODULE 1',
but CONFIG_FOO_MODULE=y also results in the same define.

Also, CONFIG options that end with '_MODULE' confuse the Kconfig/fixdep
interaction; fixdep always assumes CONFIG_FOO_MODULE comes from
CONFIG_FOO=m, so the dependency is not properly tracked for symbols
that end with '_MODULE'.

For these reasons, CONFIG options that end with '_MODULE' should be
avoided in general. (I am planning on adding a check in Kconfig.)

This is the only case in the current kernel.

The new option name was suggested by Péter Ujfalusi. [1]

[1] https://lore.kernel.org/all/[email protected]/

Fixes: 147162f57515 ("ASoC: ti: fix SND_SOC_DM365_VOICE_CODEC dependencies")
Signed-off-by: Masahiro Yamada <[email protected]>
---

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

diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig
index 698d7bc84dcf..3260a30d3d54 100644
--- a/sound/soc/ti/Kconfig
+++ b/sound/soc/ti/Kconfig
@@ -211,7 +211,7 @@ config SND_SOC_DM365_VOICE_CODEC
Say Y if you want to add support for SoC On-chip voice codec
endchoice

-config SND_SOC_DM365_VOICE_CODEC_MODULE
+config SND_SOC_DM365_SELECT_VOICE_CODECS
def_tristate y
depends on SND_SOC_DM365_VOICE_CODEC && SND_SOC
select MFD_DAVINCI_VOICECODEC
--
2.30.2


2021-09-02 05:46:47

by Péter Ujfalusi

[permalink] [raw]
Subject: Re: [PATCH] ASoC: ti: rename CONFIG_SND_SOC_DM365_VOICE_CODEC_MODULE



On 01/09/2021 19:40, Masahiro Yamada wrote:
> Kconfig generates include/generated/autoconf.h to make CONFIG options
> available to the pre-processor. Symbols with the value 'm' are suffixed
> with '_MODULE'
>
> Here is a conflict; CONFIG_FOO=m results in '#define CONFIG_FOO_MODULE 1',
> but CONFIG_FOO_MODULE=y also results in the same define.
>
> Also, CONFIG options that end with '_MODULE' confuse the Kconfig/fixdep
> interaction; fixdep always assumes CONFIG_FOO_MODULE comes from
> CONFIG_FOO=m, so the dependency is not properly tracked for symbols
> that end with '_MODULE'.
>
> For these reasons, CONFIG options that end with '_MODULE' should be
> avoided in general. (I am planning on adding a check in Kconfig.)
>
> This is the only case in the current kernel.
>
> The new option name was suggested by Péter Ujfalusi. [1]
>
> [1] https://lore.kernel.org/all/[email protected]/
>
> Fixes: 147162f57515 ("ASoC: ti: fix SND_SOC_DM365_VOICE_CODEC dependencies")
> Signed-off-by: Masahiro Yamada <[email protected]>

Thank you,

Acked-by: Peter Ujfalusi <[email protected]>

> ---
>
> sound/soc/ti/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig
> index 698d7bc84dcf..3260a30d3d54 100644
> --- a/sound/soc/ti/Kconfig
> +++ b/sound/soc/ti/Kconfig
> @@ -211,7 +211,7 @@ config SND_SOC_DM365_VOICE_CODEC
> Say Y if you want to add support for SoC On-chip voice codec
> endchoice
>
> -config SND_SOC_DM365_VOICE_CODEC_MODULE
> +config SND_SOC_DM365_SELECT_VOICE_CODECS
> def_tristate y
> depends on SND_SOC_DM365_VOICE_CODEC && SND_SOC
> select MFD_DAVINCI_VOICECODEC
>

--
Péter

2021-09-13 10:59:02

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: ti: rename CONFIG_SND_SOC_DM365_VOICE_CODEC_MODULE

On Thu, 2 Sep 2021 01:40:09 +0900, Masahiro Yamada wrote:
> Kconfig generates include/generated/autoconf.h to make CONFIG options
> available to the pre-processor. Symbols with the value 'm' are suffixed
> with '_MODULE'
>
> Here is a conflict; CONFIG_FOO=m results in '#define CONFIG_FOO_MODULE 1',
> but CONFIG_FOO_MODULE=y also results in the same define.
>
> [...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: ti: rename CONFIG_SND_SOC_DM365_VOICE_CODEC_MODULE
commit: 0f3dd4e09addc00d5b87761793b08927e7903181

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark