Commit f535ad6c authored by Lee Jones's avatar Lee Jones Committed by Greg Kroah-Hartman

usb: host: xhci-plat: Do not define 'struct acpi_device_id' when !CONFIG_ACPI

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@intel.com>
Cc: Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20200706133341.476881-33-lee.jones@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6a6d06f
...@@ -454,12 +454,14 @@ static const struct dev_pm_ops xhci_plat_pm_ops = { ...@@ -454,12 +454,14 @@ static const struct dev_pm_ops xhci_plat_pm_ops = {
NULL) NULL)
}; };
#ifdef CONFIG_ACPI
static const struct acpi_device_id usb_xhci_acpi_match[] = { static const struct acpi_device_id usb_xhci_acpi_match[] = {
/* XHCI-compliant USB Controller */ /* XHCI-compliant USB Controller */
{ "PNP0D10", }, { "PNP0D10", },
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match); MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match);
#endif
static struct platform_driver usb_xhci_driver = { static struct platform_driver usb_xhci_driver = {
.probe = xhci_plat_probe, .probe = xhci_plat_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment