| Message ID | 20190710130555.1829974-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | acpi: blacklist: fix clang warning for unused dmi table | expand |
On Wednesday, July 10, 2019 3:05:43 PM CEST Arnd Bergmann wrote: > When CONFIG_DMI is disabled, we only have a tentative declaration, > which causes a warning from clang: > > drivers/acpi/blacklist.c:20:35: error: tentative array definition assumed to have one element [-Werror] > static const struct dmi_system_id acpi_rev_dmi_table[] __initconst; > > As the variable is not actually used here, hide it entirely > in an #ifdef to shut up the warning. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/acpi/blacklist.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c > index ad2c565f5cbe..a86a770c9b79 100644 > --- a/drivers/acpi/blacklist.c > +++ b/drivers/acpi/blacklist.c > @@ -17,7 +17,9 @@ > > #include "internal.h" > > +#ifdef CONFIG_DMI > static const struct dmi_system_id acpi_rev_dmi_table[] __initconst; > +#endif > > /* > * POLICY: If *anything* doesn't work, put it on the blacklist. > @@ -61,7 +63,9 @@ int __init acpi_blacklisted(void) > } > > (void)early_acpi_osi_init(); > +#ifdef CONFIG_DMI > dmi_check_system(acpi_rev_dmi_table); > +#endif > > return blacklisted; > } > Applied, thanks!
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index ad2c565f5cbe..a86a770c9b79 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -17,7 +17,9 @@ #include "internal.h" +#ifdef CONFIG_DMI static const struct dmi_system_id acpi_rev_dmi_table[] __initconst; +#endif /* * POLICY: If *anything* doesn't work, put it on the blacklist. @@ -61,7 +63,9 @@ int __init acpi_blacklisted(void) } (void)early_acpi_osi_init(); +#ifdef CONFIG_DMI dmi_check_system(acpi_rev_dmi_table); +#endif return blacklisted; }
When CONFIG_DMI is disabled, we only have a tentative declaration, which causes a warning from clang: drivers/acpi/blacklist.c:20:35: error: tentative array definition assumed to have one element [-Werror] static const struct dmi_system_id acpi_rev_dmi_table[] __initconst; As the variable is not actually used here, hide it entirely in an #ifdef to shut up the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/acpi/blacklist.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.0