summaryrefslogtreecommitdiff
path: root/src/superio
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/superio
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/superio')
-rw-r--r--src/superio/aspeed/ast2400/superio.c2
-rw-r--r--src/superio/common/generic.c4
-rw-r--r--src/superio/nuvoton/nct5539d/superio.c6
-rw-r--r--src/superio/nuvoton/nct6791d/superio.c6
-rw-r--r--src/superio/nuvoton/npcd378/superio.c18
5 files changed, 18 insertions, 18 deletions
diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c
index 4867f6ed88..a896b643c6 100644
--- a/src/superio/aspeed/ast2400/superio.c
+++ b/src/superio/aspeed/ast2400/superio.c
@@ -66,7 +66,7 @@ static struct device_operations ops = {
.init = ast2400_init,
.ops_pnp_mode = &pnp_conf_mode_a5a5_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = superio_common_fill_ssdt_generator,
+ .acpi_fill_ssdt = superio_common_fill_ssdt_generator,
.acpi_name = superio_common_ldn_acpi_name,
.acpi_hid = ast2400_acpi_hid,
#endif
diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c
index 809f8866ca..20ffb3db18 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -300,8 +300,8 @@ static struct device_operations ops = {
.enable_resources = DEVICE_NOOP,
.scan_bus = scan_static_bus,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = generic_ssdt,
- .acpi_name = generic_acpi_name,
+ .acpi_fill_ssdt = generic_ssdt,
+ .acpi_name = generic_acpi_name,
#endif
};
diff --git a/src/superio/nuvoton/nct5539d/superio.c b/src/superio/nuvoton/nct5539d/superio.c
index 5402b2e0fd..9a620c97ee 100644
--- a/src/superio/nuvoton/nct5539d/superio.c
+++ b/src/superio/nuvoton/nct5539d/superio.c
@@ -52,9 +52,9 @@ static struct device_operations ops = {
.init = nct5539d_init,
.ops_pnp_mode = &pnp_conf_mode_8787_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = superio_common_fill_ssdt_generator,
- .acpi_name = superio_common_ldn_acpi_name,
- .acpi_hid = nct5539d_acpi_hid,
+ .acpi_fill_ssdt = superio_common_fill_ssdt_generator,
+ .acpi_name = superio_common_ldn_acpi_name,
+ .acpi_hid = nct5539d_acpi_hid,
#endif
};
diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c
index a8e267b912..e04a9232ae 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -50,9 +50,9 @@ static struct device_operations ops = {
.init = nct6791d_init,
.ops_pnp_mode = &pnp_conf_mode_8787_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = superio_common_fill_ssdt_generator,
- .acpi_name = superio_common_ldn_acpi_name,
- .acpi_hid = nct6791d_acpi_hid,
+ .acpi_fill_ssdt = superio_common_fill_ssdt_generator,
+ .acpi_name = superio_common_ldn_acpi_name,
+ .acpi_hid = nct6791d_acpi_hid,
#endif
};
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index 95a4babbb7..94b42a02cf 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -422,16 +422,16 @@ static void npcd378_fill_ssdt_generator(struct device *dev)
#endif
static struct device_operations ops = {
- .read_resources = pnp_read_resources,
- .set_resources = pnp_set_resources,
- .enable_resources = pnp_enable_resources,
- .enable = pnp_alt_enable,
- .init = npcd378_init,
- .ops_pnp_mode = &pnp_conf_mode_8787_aa,
+ .read_resources = pnp_read_resources,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_alt_enable,
+ .init = npcd378_init,
+ .ops_pnp_mode = &pnp_conf_mode_8787_aa,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt_generator = npcd378_fill_ssdt_generator,
- .acpi_name = superio_common_ldn_acpi_name,
- .acpi_hid = npcd378_acpi_hid,
+ .acpi_fill_ssdt = npcd378_fill_ssdt_generator,
+ .acpi_name = superio_common_ldn_acpi_name,
+ .acpi_hid = npcd378_acpi_hid,
#endif
};