GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/wifi/generic: Limit scope of ACPI-related functions to generic.c 

This change limits the scope of `wifi_generic_fill_ssdt()` and
`wifi_generic_acpi_name()` to generic.c since they are not used
outside of this file anymore. Also, since there is no need to split
SSDT generator into two separate functions,
`wifi_generic_fill_ssdt_generator()` is dropped and `.acpi_fill_ssdt`
directly points to `wifi_generic_fill_ssdt()`.

BUG=b:169802515
BRANCH=zork

Change-Id: I2cbb97f43d2d9f9ed6d3cf8f0a9b13a7f30e922e
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46038
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Rob Barnes <robbarnes@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Furquan Shaikh 2020-10-04 18:05:28 -07:00
parent 8262a2c718
commit 44f14509ed
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/drivers/wifi/generic/chip.h
View File

@ -11,26 +11,4 @@ struct drivers_wifi_generic_config {
unsigned int wake; unsigned int wake;
}; };
/**
* wifi_generic_fill_ssdt() - Fill ACPI SSDT table for WiFi controller
* @dev: Device structure corresponding to WiFi controller.
* @config: Generic wifi config required to fill ACPI SSDT table.
*
* This function implements common device operation to help fill ACPI SSDT
* table for WiFi controller.
*/
void wifi_generic_fill_ssdt(const struct device *dev,
const struct drivers_wifi_generic_config *config);
/**
* wifi_generic_acpi_name() - Get ACPI name for WiFi controller
* @dev: Device structure corresponding to WiFi controller.
*
* This function implements common device operation to get the ACPI name for
* WiFi controller.
*
* Return: string representing the ACPI name for WiFi controller.
*/
const char *wifi_generic_acpi_name(const struct device *dev);
#endif /* _GENERIC_WIFI_H_ */ #endif /* _GENERIC_WIFI_H_ */

13
src/drivers/wifi/generic/generic.c
View File

@ -163,11 +163,11 @@ static void emit_sar_acpi_structures(void)
acpigen_pop_len(); acpigen_pop_len();
} }
void wifi_generic_fill_ssdt(const struct device *dev, static void wifi_generic_fill_ssdt(const struct device *dev)
const struct drivers_wifi_generic_config *config)
{ {
const char *path; const char *path;
u32 address; u32 address;
const struct drivers_wifi_generic_config *config = dev->chip_info;
if (!dev->enabled) if (!dev->enabled)
return; return;
@ -226,7 +226,7 @@ void wifi_generic_fill_ssdt(const struct device *dev,
dev->chip_ops ? dev->chip_ops->name : "", dev_path(dev)); dev->chip_ops ? dev->chip_ops->name : "", dev_path(dev));
} }
const char *wifi_generic_acpi_name(const struct device *dev) static const char *wifi_generic_acpi_name(const struct device *dev)
{ {
static char wifi_acpi_name[WIFI_ACPI_NAME_MAX_LEN]; static char wifi_acpi_name[WIFI_ACPI_NAME_MAX_LEN];
@ -235,11 +235,6 @@ const char *wifi_generic_acpi_name(const struct device *dev)
(dev_path_encode(dev) & 0xff)); (dev_path_encode(dev) & 0xff));
return wifi_acpi_name; return wifi_acpi_name;
} }
static void wifi_generic_fill_ssdt_generator(const struct device *dev)
{
wifi_generic_fill_ssdt(dev, dev->chip_info);
}
#endif #endif
static void wifi_pci_dev_init(struct device *dev) static void wifi_pci_dev_init(struct device *dev)
@ -292,7 +287,7 @@ struct device_operations wifi_generic_ops = {
.ops_pci = &pci_dev_ops_pci, .ops_pci = &pci_dev_ops_pci,
#if CONFIG(HAVE_ACPI_TABLES) #if CONFIG(HAVE_ACPI_TABLES)
.acpi_name = wifi_generic_acpi_name, .acpi_name = wifi_generic_acpi_name,
.acpi_fill_ssdt = wifi_generic_fill_ssdt_generator, .acpi_fill_ssdt = wifi_generic_fill_ssdt,
#endif #endif
#if CONFIG(GENERATE_SMBIOS_TABLES) #if CONFIG(GENERATE_SMBIOS_TABLES)
.get_smbios_data = smbios_write_wifi, .get_smbios_data = smbios_write_wifi,