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>
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 7f73cef..0a3d623 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -65,12 +65,12 @@
#endif
static struct device_operations adau7002_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = adau7002_acpi_name,
- .acpi_fill_ssdt_generator = adau7002_fill_ssdt,
+ .acpi_name = adau7002_acpi_name,
+ .acpi_fill_ssdt = adau7002_fill_ssdt,
#endif
};
diff --git a/src/drivers/generic/generic/generic.c b/src/drivers/generic/generic/generic.c
index c68fa3a..0ba2d53 100644
--- a/src/drivers/generic/generic/generic.c
+++ b/src/drivers/generic/generic/generic.c
@@ -78,11 +78,11 @@
}
static struct device_operations generic_dev_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = generic_dev_acpi_name,
- .acpi_fill_ssdt_generator = generic_dev_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = generic_dev_acpi_name,
+ .acpi_fill_ssdt = generic_dev_fill_ssdt_generator,
};
static void generic_dev_enable(struct device *dev)
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 753a555..67c5913 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -112,11 +112,11 @@
}
static struct device_operations gpio_keys_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = gpio_keys_acpi_name,
- .acpi_fill_ssdt_generator = gpio_keys_fill_ssdt_generator,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = gpio_keys_acpi_name,
+ .acpi_fill_ssdt = gpio_keys_fill_ssdt_generator,
};
static void gpio_keys_enable(struct device *dev)
diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c
index 23c044d..b476126 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/src/drivers/generic/gpio_regulator/gpio_regulator.c
@@ -73,7 +73,7 @@
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.acpi_name = gpio_regulator_acpi_name,
- .acpi_fill_ssdt_generator = gpio_regulator_fill_ssdt_generator,
+ .acpi_fill_ssdt = gpio_regulator_fill_ssdt_generator,
};
static void gpio_regulator_enable(struct device *dev)
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 56fd26c3..6f724f8 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -80,12 +80,12 @@
#endif
static struct device_operations max98357a_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_name = max98357a_acpi_name,
- .acpi_fill_ssdt_generator = max98357a_fill_ssdt,
+ .acpi_name = max98357a_acpi_name,
+ .acpi_fill_ssdt = max98357a_fill_ssdt,
#endif
};