[PATCH 28/32] usb: host: ehci-platform: Do not define 'struct acpi_device_id' when !CONFIG_ACPI

From: Lee Jones
Date: Mon Jul 06 2020 - 09:34:56 EST


Since ACPI_PTR() is used to NULLify the value when !CONFIG_ACPI,
struct ehci_acpi_match becomes defined by unused.

Fixes the following W=1 kernel build warning(s):

drivers/usb/host/ehci-platform.c:478:36: warning: âehci_acpi_matchâ defined but not used [-Wunused-const-variable=]
478 | static const struct acpi_device_id ehci_acpi_match[] = {
| ^~~~~~~~~~~~~~~

Cc: Tony Prisk <linux@xxxxxxxxxxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
Cc: Steven Brown <sbrown@xxxxxxxxxxxx>
Cc: Hauke Mehrtens <hauke@xxxxxxxxxx>
Cc: de Goede <hdegoede@xxxxxxxxxx>
Cc: Michael Buesch <m@xxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/usb/host/ehci-platform.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index e9a49007cce4a..006c4f6188a52 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -475,11 +475,13 @@ static const struct of_device_id vt8500_ehci_ids[] = {
};
MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);

+#ifdef CONFIG_ACPI
static const struct acpi_device_id ehci_acpi_match[] = {
{ "PNP0D20", 0 }, /* EHCI controller without debug */
{ }
};
MODULE_DEVICE_TABLE(acpi, ehci_acpi_match);
+#endif

static const struct platform_device_id ehci_platform_table[] = {
{ "ehci-platform", 0 },
--
2.25.1