[PATCH 0/2] Kconfig symbol clean-up for sound
Dear sound maintainers,
The script ./scripts/checkkconfigsymbols.py warns on invalid references to Kconfig symbols (often, minor typos, name confusions or outdated references). This is a patch series addressing the issues reported by ./scripts/checkkconfigsymbols.py in the ./sound/ directory for Kconfig files, quickly filtered down with:
./scripts/checkkconfigsymbols.py | grep "sound.*Kconfig" -B 1
This patch series addresses:
SND_SOC_UNIPHIER_AIO_DMA Referencing files: sound/soc/uniphier/Kconfig
SND_SOC_WCD937X Referencing files: sound/soc/codecs/Kconfig
This patch series does not address:
CLK_FIXED_FCH Referencing files: sound/soc/amd/Kconfig, sound/soc/amd/acp/Kconfig
Rationale: config definition has been submitted, but is still pending for inclusion through another tree.
SND_SOC_AC97_BUS_NEW Referencing files: sound/soc/pxa/Kconfig
Rationale: waiting for response; the kernel developer has been informed here: https://lore.kernel.org/all/CAKXUXMzqgyNGEnxAMQqZiXJYSK-X8uB-nxHWwPg41H6yS0G...
Both patches in this series can be discussed and applied individually. They are sent in one patch series, as they orginate from the investigation guided by the same tool and hence share similar topics and resolutions.
Please pick this series of minor clean-up patches. It applies cleanly on next-20211124.
Best regards,
Lukas
Lukas Bulwahn (2): ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA ASoC: codecs: wcd938x: add SND_SOC_WCD938_SDW to codec list instead
sound/soc/codecs/Kconfig | 3 +-- sound/soc/uniphier/Kconfig | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-)
Commit f37fe2f9987b ("ASoC: uniphier: add support for UniPhier AIO common driver") adds configs SND_SOC_UNIPHIER_{LD11,PXS2}, which select the non-existing config SND_SOC_UNIPHIER_AIO_DMA.
Hence, ./scripts/checkkconfigsymbols.py warns:
SND_SOC_UNIPHIER_AIO_DMA Referencing files: sound/soc/uniphier/Kconfig
Probably, there is actually no further config intended to be selected here. So, just drop selecting the non-existing config.
Fixes: f37fe2f9987b ("ASoC: uniphier: add support for UniPhier AIO common driver") Signed-off-by: Lukas Bulwahn lukas.bulwahn@gmail.com --- sound/soc/uniphier/Kconfig | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/uniphier/Kconfig b/sound/soc/uniphier/Kconfig index aa3592ee1358..ddfa6424c656 100644 --- a/sound/soc/uniphier/Kconfig +++ b/sound/soc/uniphier/Kconfig @@ -23,7 +23,6 @@ config SND_SOC_UNIPHIER_LD11 tristate "UniPhier LD11/LD20 Device Driver" depends on SND_SOC_UNIPHIER select SND_SOC_UNIPHIER_AIO - select SND_SOC_UNIPHIER_AIO_DMA help This adds ASoC driver for Socionext UniPhier LD11/LD20 input and output that can be used with other codecs. @@ -34,7 +33,6 @@ config SND_SOC_UNIPHIER_PXS2 tristate "UniPhier PXs2 Device Driver" depends on SND_SOC_UNIPHIER select SND_SOC_UNIPHIER_AIO - select SND_SOC_UNIPHIER_AIO_DMA help This adds ASoC driver for Socionext UniPhier PXs2 input and output that can be used with other codecs.
Commit 045442228868 ("ASoC: codecs: wcd938x: add audio routing and Kconfig") adds SND_SOC_WCD937X, which does not exist, and SND_SOC_WCD938X, which seems not really to be the intended config to be selected, but only a supporting config symbol to the actual config SND_SOC_WCD938X_SDW for the codec.
Add SND_SOC_WCD938_SDW to the list instead of SND_SOC_WCD93{7,8}X.
The issue was identified with ./scripts/checkkconfigsymbols.py.
Fixes: 045442228868 ("ASoC: codecs: wcd938x: add audio routing and Kconfig") Signed-off-by: Lukas Bulwahn lukas.bulwahn@gmail.com --- sound/soc/codecs/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 3fe62df32238..b6d1827e7986 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -241,8 +241,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_UDA1380 imply SND_SOC_WCD9335 imply SND_SOC_WCD934X - imply SND_SOC_WCD937X - imply SND_SOC_WCD938X + imply SND_SOC_WCD938X_SDW imply SND_SOC_LPASS_RX_MACRO imply SND_SOC_LPASS_TX_MACRO imply SND_SOC_WL1273
On Thu, 25 Nov 2021 10:51:56 +0100, Lukas Bulwahn wrote:
The script ./scripts/checkkconfigsymbols.py warns on invalid references to Kconfig symbols (often, minor typos, name confusions or outdated references). This is a patch series addressing the issues reported by ./scripts/checkkconfigsymbols.py in the ./sound/ directory for Kconfig files, quickly filtered down with:
./scripts/checkkconfigsymbols.py | grep "sound.*Kconfig" -B 1
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA commit: 49f893253ab43566e34332a969324531fea463f6 [2/2] ASoC: codecs: wcd938x: add SND_SOC_WCD938_SDW to codec list instead commit: 2039cc1da4bee1fd0df644e26b28ed769cd32a81
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
participants (2)
-
Lukas Bulwahn
-
Mark Brown