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/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index f82cd9f..5c67eda 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -108,12 +108,12 @@
#endif
static struct device_operations da7219_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 = da7219_acpi_name,
- .acpi_fill_ssdt_generator = da7219_fill_ssdt,
+ .acpi_name = da7219_acpi_name,
+ .acpi_fill_ssdt = da7219_fill_ssdt,
#endif
};
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 0b36e5f..592e791 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -190,12 +190,12 @@
#endif
static struct device_operations i2c_generic_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 = i2c_generic_acpi_name,
- .acpi_fill_ssdt_generator = i2c_generic_fill_ssdt_generator,
+ .acpi_name = i2c_generic_acpi_name,
+ .acpi_fill_ssdt = i2c_generic_fill_ssdt_generator,
#endif
};
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index b8185d0..6e4169e 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -47,12 +47,12 @@
#endif
static struct device_operations i2c_hid_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 = i2c_hid_acpi_name,
- .acpi_fill_ssdt_generator = i2c_hid_fill_ssdt_generator,
+ .acpi_name = i2c_hid_acpi_name,
+ .acpi_fill_ssdt = i2c_hid_fill_ssdt_generator,
#endif
};
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index 48db3e1..71ba75b 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -85,11 +85,11 @@
}
static struct device_operations max98373_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = max98373_acpi_name,
- .acpi_fill_ssdt_generator = max98373_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = max98373_acpi_name,
+ .acpi_fill_ssdt = max98373_fill_ssdt,
};
static void max98373_enable(struct device *dev)
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index 1cc72d3..7979fe3 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -81,11 +81,11 @@
}
static struct device_operations max98927_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = max98927_acpi_name,
- .acpi_fill_ssdt_generator = max98927_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = max98927_acpi_name,
+ .acpi_fill_ssdt = max98927_fill_ssdt,
};
static void max98927_enable(struct device *dev)
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 33b3421..5d56b24 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -96,12 +96,12 @@
#endif
static struct device_operations nau8825_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 = nau8825_acpi_name,
- .acpi_fill_ssdt_generator = nau8825_fill_ssdt,
+ .acpi_name = nau8825_acpi_name,
+ .acpi_fill_ssdt = nau8825_fill_ssdt,
#endif
};
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index 8dc3cd9..cfaeae8 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/src/drivers/i2c/rt1011/rt1011.c
@@ -99,7 +99,7 @@
.set_resources = DEVICE_NOOP,
.enable_resources = DEVICE_NOOP,
.acpi_name = rt1011_acpi_name,
- .acpi_fill_ssdt_generator = rt1011_fill_ssdt,
+ .acpi_fill_ssdt = rt1011_fill_ssdt,
};
static void rt1011_enable(struct device *dev)
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 6f4e032..15014cd 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -85,11 +85,11 @@
}
static struct device_operations rt5663_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = rt5663_acpi_name,
- .acpi_fill_ssdt_generator = rt5663_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = rt5663_acpi_name,
+ .acpi_fill_ssdt = rt5663_fill_ssdt,
};
static void rt5663_enable(struct device *dev)
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 9da6875..781d09d 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -89,11 +89,11 @@
}
static struct device_operations i2c_sx9310_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = i2c_sx9310_acpi_name,
- .acpi_fill_ssdt_generator = i2c_sx9310_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = i2c_sx9310_acpi_name,
+ .acpi_fill_ssdt = i2c_sx9310_fill_ssdt,
};
static void i2c_sx9310_enable(struct device *dev)
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index b13f6667..d36e4c2 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -72,11 +72,11 @@
}
static struct device_operations i2c_tpm_ops = {
- .read_resources = DEVICE_NOOP,
- .set_resources = DEVICE_NOOP,
- .enable_resources = DEVICE_NOOP,
- .acpi_name = i2c_tpm_acpi_name,
- .acpi_fill_ssdt_generator = i2c_tpm_fill_ssdt,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .acpi_name = i2c_tpm_acpi_name,
+ .acpi_fill_ssdt = i2c_tpm_fill_ssdt,
};
static void i2c_tpm_enable(struct device *dev)