[coreboot-gerrit] Change in coreboot[master]: drivers/wifi/generic: Drop the dependency on HAVE_ACPI_TABLES

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46037 )

Change subject: drivers/wifi/generic: Drop the dependency on HAVE_ACPI_TABLES
......................................................................

drivers/wifi/generic: Drop the dependency on HAVE_ACPI_TABLES

This change drops the dependency of DRIVERS_WIFI_GENERIC on
HAVE_ACPI_TABLES as the driver provides operations other than the ACPI
support for WiFi devices. Since the dependency is now dropped, ACPI
operations in generic.c are guarded by CONFIG(HAVE_ACPI_TABLES).

BUG=b:169802515
BRANCH=zork

Change-Id: I16444a9d842a6742e3c97ef04c4f18e93e6cdaa9
Signed-off-by: Furquan Shaikh 
---
M src/drivers/wifi/generic/Kconfig
M src/drivers/wifi/generic/generic.c
2 files changed, 4 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/46037/1

diff --git a/src/drivers/wifi/generic/Kconfig b/src/drivers/wifi/generic/Kconfig
index 049a952..ddd2be9 100644
--- a/src/drivers/wifi/generic/Kconfig
+++ b/src/drivers/wifi/generic/Kconfig
@@ -1,7 +1,6 @@
 config DRIVERS_WIFI_GENERIC
    bool
    default n
-	depends on HAVE_ACPI_TABLES
    help
      When enabled, add identifiers in ACPI tables that are common
      to WiFi chipsets from multiple vendors.
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c
index b515f3c..97f5bda 100644
--- a/src/drivers/wifi/generic/generic.c
+++ b/src/drivers/wifi/generic/generic.c
@@ -37,6 +37,7 @@
  */
 #define WIFI_ACPI_NAME_MAX_LEN 5

+#if CONFIG(HAVE_ACPI_TABLES)
 __weak
 int get_wifi_sar_limits(struct wifi_sar_limits *sar_limits)
 {
@@ -239,6 +240,7 @@
 {
    wifi_generic_fill_ssdt(dev, dev->chip_info);
 }
+#endif

static void wifi_pci_dev_init(struct device *dev)
 {
@@ -287,8 +289,10 @@
    .enable_resources	= pci_dev_enable_resources,
    .init			= wifi_pci_dev_init,
    .ops_pci		= &pci_dev_ops_pci,
+#if CONFIG(HAVE_ACPI_TABLES)
    .acpi_name		= wifi_generic_acpi_name,
    .acpi_fill_ssdt		= wifi_generic_fill_ssdt_generator,
+#endif
 #if CONFIG(GENERATE_SMBIOS_TABLES)
    .get_smbios_data		= smbios_write_wifi,
 #endif