Skip to contentSkip to conversation

ASoC: codecs: rk3308: fix building without CONFIG_OF

PATCH In review Arnd Bergmann 4 participants 4 messages Apr 4, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: codecs: rk3308: fix building without CONFIG_OF

From: Arnd Bergmann <[email protected]>

The newly added codec has an extraneous of_match_ptr() annotation for the ID table:

sound/soc/codecs/rk3308_codec.c:956:34: error: 'rk3308_codec_of_match' defined but not used [-Werror=unused-const-variable=]
956 | static const struct of_device_id rk3308_codec_of_match[] = {

Remove it to avoid introducing a warning when -Wunused-const-variable gets enabled by default:

Fixes 4ed0915f5bc4 ("ASoC: codecs: Add RK3308 internal audio codec driver")
---
 sound/soc/codecs/rk3308_codec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rk3308_codec.c +1 -1
index 9d3e4691a7b5..6b1cb92997b4 100644
@@ -962,7 +962,7 @@ MODULE_DEVICE_TABLE(of, rk3308_codec_of_match);
 static struct platform_driver rk3308_codec_driver = {
 	.driver = {
 		.name = "rk3308-acodec",
-		.of_match_table = of_match_ptr(rk3308_codec_of_match),
+		.of_match_table = rk3308_codec_of_match,
 	},
 	.probe = rk3308_codec_platform_probe,
 };
Signature · 1 line
2.39.2
maintainer
#1 lore raw

Hello Arnd,

Quoted 22 lines · On Thu, 4 Apr 2024 11:57:34 +0200 Arnd Bergmann <[email protected]> wrote:

From: Arnd Bergmann <[email protected]>

The newly added codec has an extraneous of_match_ptr() annotation for the ID table:

sound/soc/codecs/rk3308_codec.c:956:34: error: 'rk3308_codec_of_match' defined but not used [-Werror=unused-const-variable=]
956 | static const struct of_device_id rk3308_codec_of_match[] = {

Remove it to avoid introducing a warning when -Wunused-const-variable gets enabled by default:

Fixes 4ed0915f5bc4 ("ASoC: codecs: Add RK3308 internal audio codec driver")
---
 sound/soc/codecs/rk3308_codec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rk3308_codec.c +0 -0
index 9d3e4691a7b5..6b1cb92997b4 100644

sound/soc/codecs/rk3308_codec.c MODULE_DEVICE_TABLE(of, rk3308_codec_of_match); · line 965

Quoted 5 lines
sound/soc/codecs/rk3308_codec.c +1 -1
@@ -962,7 +962,7 @@ MODULE_DEVICE_TABLE(of, rk3308_codec_of_match);
 static struct platform_driver rk3308_codec_driver = {
 	.driver = {
 		.name = "rk3308-acodec",
-		.of_match_table = of_match_ptr(rk3308_codec_of_match),
+		.of_match_table = rk3308_codec_of_match,

Thanks for your report!

The warning has already been reported by the kernel test robot <[email protected]> and I have sent a patch to fix it:
https://lore.kernel.org/linux-sound/20240403-rk3308-audio-codec-fix-warning-v2-1-816bae4c1dc5@bootlin.com/

The approach I took is different though: I have added __maybe_unused instead, which has the advantage of not adding a struct of_device_id array to kernel built without CONFIG_OF.

My patch has already been taken by Mark. I hope this is fine as well for you.

Best regards,
Luca

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw
Quoted 8 lines · Luca Ceresoli

On Thu, 4 Apr 2024 11:57:34 +0200

Thanks for your report!

The warning has already been reported by the kernel test robot <[email protected]> and I have sent a patch to fix it:
https://lore.kernel.org/linux-sound/20240403-rk3308-audio-codec-fix-warning-v2-1-816bae4c1dc5@bootlin.com/

Quoted 6 lines

The approach I took is different though: I have added __maybe_unused instead, which has the advantage of not adding a struct of_device_id array to kernel built without CONFIG_OF.

My patch has already been taken by Mark. I hope this is fine as well for you.

We can clean it up later. Adding __maybe_unused is completely pointless here, as the purpose of the of_match_ptr() macro is just to deal with ID tables that were hidden behind an #ifdef, which yours is not.

Arnd

maintainer
#3 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

The newly added codec has an extraneous of_match_ptr() annotation for the ID table:

sound/soc/codecs/rk3308_codec.c:956:34: error: 'rk3308_codec_of_match' defined but not used [-Werror=unused-const-variable=]
956 | static const struct of_device_id rk3308_codec_of_match[] = {

Remove it to avoid introducing a warning when -Wunused-const-variable gets enabled by default:

[...]

Applied to

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

Thanks!

[1/1] ASoC: codecs: rk3308: fix building without CONFIG_OF

      commit: 2ba2d17170f9e415fc31d7978214f0f26e8afc64

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