summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-07-10 15:05:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-07-11 22:45:00 +0200
commitb80d6a42bdc97bdb6139107d6034222e9843c6e2 (patch)
tree7347024d4a1acaab3c9c0513a922264aaa2ab2bc /drivers/acpi
parentMerge tag 'acpi-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff)
downloadlinux-b80d6a42bdc97bdb6139107d6034222e9843c6e2.tar.xz
linux-b80d6a42bdc97bdb6139107d6034222e9843c6e2.zip
ACPI: blacklist: fix clang warning for unused DMI table
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> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/blacklist.c4
1 files changed, 4 insertions, 0 deletions
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;
}