Commit f535ad6c authored Jul 06, 2020 by Lee Jones Committed by Greg Kroah-Hartman Jul 09, 2020

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: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20200706133341.476881-33-lee.jones@linaro.org


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a6a6d06f

drivers/usb/host/xhci-plat.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,

Admin message