[PATCH 32/32] usb: host: xhci-plat: Do not define 'struct acpi_device_id' when !CONFIG_ACPI

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


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

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

drivers/usb/host/xhci-plat.c:457:36: warning: âusb_xhci_acpi_matchâ defined but not used [-Wunused-const-variable=]
457 | static const struct acpi_device_id usb_xhci_acpi_match[] = {
| ^~~~~~~~~~~~~~~~~~~

Cc: Mathias Nyman <mathias.nyman@xxxxxxxxx>
Cc: Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/usb/host/xhci-plat.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index f6b4089bfc4a5..3e15b70a6fc99 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -454,12 +454,14 @@ static const struct dev_pm_ops xhci_plat_pm_ops = {
NULL)
};

+#ifdef CONFIG_ACPI
static const struct acpi_device_id usb_xhci_acpi_match[] = {
/* XHCI-compliant USB Controller */
{ "PNP0D10", },
{ }
};
MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match);
+#endif

static struct platform_driver usb_xhci_driver = {
.probe = xhci_plat_probe,
--
2.25.1