aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/intel
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2020-03-31 17:34:52 +0200
committerMatt DeVillier <matt.devillier@gmail.com>2020-04-02 20:30:22 +0000
commit68680dd7cd1a2678406610e99400bd25bf7fa282 (patch)
treef587cbc24811dd99a40980c2880d042eedfaff7d /src/drivers/intel
parent35bff432e5456acec8e68adca6b496fda53c6c57 (diff)
Trim `.acpi_fill_ssdt_generator` and `.acpi_inject_dsdt_generator`
These two identifiers were always very confusing. We're not filling and injecting generators. We are filling SSDTs and injecting into the DSDT. So drop the `_generator` suffix. Hopefully, this also makes ACPI look a little less scary. Change-Id: I6f0e79632c9c855f38fe24c0186388a25990c44d Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39977 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: David Guckian Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/intel')
-rw-r--r--src/drivers/intel/ish/ish.c8
-rw-r--r--src/drivers/intel/mipi_camera/camera.c10
-rw-r--r--src/drivers/intel/wifi/wifi.c16
3 files changed, 17 insertions, 17 deletions
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index d542bd371a..256b486dc8 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -40,10 +40,10 @@ static void ish_fill_ssdt_generator(struct device *dev)
}
static struct device_operations intel_ish_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_fill_ssdt_generator = ish_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_fill_ssdt = ish_fill_ssdt_generator,
};
static void intel_ish_enable(struct device *dev)
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 0cada814e9..92fa00b956 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -78,11 +78,11 @@ static const char *camera_acpi_name(const struct device *dev)
}
static struct device_operations camera_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = camera_acpi_name,
- .acpi_fill_ssdt_generator = camera_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = camera_acpi_name,
+ .acpi_fill_ssdt = camera_fill_ssdt,
};
static void camera_enable(struct device *dev)
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index e5efbe15fb..af7407df2f 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -90,17 +90,17 @@ static struct pci_operations pci_ops = {
};
struct device_operations device_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = wifi_pci_dev_init,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = wifi_pci_dev_init,
#if CONFIG(GENERATE_SMBIOS_TABLES)
- .get_smbios_data = smbios_write_wifi,
+ .get_smbios_data = smbios_write_wifi,
#endif
- .ops_pci = &pci_ops,
+ .ops_pci = &pci_ops,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = generic_wifi_acpi_name,
- .acpi_fill_ssdt_generator = intel_wifi_fill_ssdt,
+ .acpi_name = generic_wifi_acpi_name,
+ .acpi_fill_ssdt = intel_wifi_fill_ssdt,
#endif
};