On Wed, Apr 03, 2024 at 10:06:50AM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@xxxxxxxx> > > When building with CONFIG_OF and/or CONFIG_ACPI disabled but W=1 extra > warnings enabled, a lot of driver cause a warning about an unused > ID table: > > sound/soc/atmel/sam9x5_wm8731.c:187:34: error: unused variable 'sam9x5_wm8731_of_match' [-Werror,-Wunused-const-variable] > sound/soc/codecs/rt5514-spi.c:496:34: error: unused variable 'rt5514_of_match' [-Werror,-Wunused-const-variable] > sound/soc/samsung/aries_wm8994.c:524:34: error: unused variable 'samsung_wm8994_of_match' [-Werror,-Wunused-const-variable] > > The fix is always to just remove the of_match_ptr() and ACPI_PTR() wrappers > that remove the reference, rather than adding another #ifdef just for build > testing for a configuration that doesn't matter in practice. ... > index d6cdb6d9fdd6..ffc105759994 100644 > --- a/sound/soc/amd/acp3x-rt5682-max9836.c > +++ b/sound/soc/amd/acp3x-rt5682-max9836.c > @@ -543,7 +543,7 @@ MODULE_DEVICE_TABLE(acpi, acp3x_audio_acpi_match); > static struct platform_driver acp3x_audio = { > .driver = { > .name = "acp3x-alc5682-max98357", > - .acpi_match_table = ACPI_PTR(acp3x_audio_acpi_match), > + .acpi_match_table = acp3x_audio_acpi_match, > .pm = &snd_soc_pm_ops, > }, > .probe = acp3x_probe, Replace acpi_match_device() by device_get_match_data() and acpi.h by mod_devicetable.h + property.h. I really would like to see agnostic drivers (when they don't need of*.h/acpi.h to be included as "proxy" headers). With this, the change probably needs to be separated from this patch. If you address as suggested, Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> ... The rest I haven't checked, it might be possible to do something similar there as well. -- With Best Regards, Andy Shevchenko