[PATCH v2 01/11] ACPI / LPSS: Add guards against CONFIG_PCI

Sinan Kaya
2018-12-22T09:07:10Z

We can now compile ACPI without PCI support. If code depends on CONFIG_PCI,
it needs to explicitly guard that piece.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/acpi_lpss.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 5f94c35d165f..4148abcdf9ef 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -534,8 +534,11 @@ static struct device *acpi_lpss_find_device(const char *hid, const char *uid)
dev = bus_find_device(&platform_bus_type, NULL, &data, match_hid_uid);
if (dev)
return dev;
-
+#ifdef CONFIG_PCI
return bus_find_device(&pci_bus_type, NULL, &data, match_hid_uid);
+#else
+ return NULL;
+#endif
}

static bool acpi_lpss_dep(struct acpi_device *adev, acpi_handle handle)
--
2.19.0