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>

4 files changed, 29 insertions, 29 deletions

diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index e1eb6fe6fb..55c181b0bd 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -126,16 +126,16 @@ void graphics_gtt_rmw(unsigned long reg, uint32_t andmask, uint32_t ormask)
 }
 
 static const struct device_operations graphics_ops = {
-	.read_resources			= pci_dev_read_resources,
-	.set_resources			= pci_dev_set_resources,
-	.enable_resources		= pci_dev_enable_resources,
-	.init				= graphics_soc_init,
-	.ops_pci			= &pci_dev_ops_pci,
+	.read_resources		= pci_dev_read_resources,
+	.set_resources		= pci_dev_set_resources,
+	.enable_resources	= pci_dev_enable_resources,
+	.init			= graphics_soc_init,
+	.ops_pci		= &pci_dev_ops_pci,
 #if CONFIG(HAVE_ACPI_TABLES)
-	.write_acpi_tables		= graphics_soc_write_acpi_opregion,
-	.acpi_fill_ssdt_generator	= gma_generate_ssdt,
+	.write_acpi_tables	= graphics_soc_write_acpi_opregion,
+	.acpi_fill_ssdt		= gma_generate_ssdt,
 #endif
-	.scan_bus			= scan_generic_bus,
+	.scan_bus		= scan_generic_bus,
 };
 
 static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index b5ea15e0c6..6612210a84 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -175,15 +175,15 @@ static void dw_i2c_device_init(struct device *dev)
 }
 
 static struct device_operations i2c_dev_ops = {
-	.read_resources			= pci_dev_read_resources,
-	.set_resources			= pci_dev_set_resources,
-	.enable_resources		= pci_dev_enable_resources,
-	.scan_bus			= scan_smbus,
-	.ops_i2c_bus			= &dw_i2c_bus_ops,
-	.ops_pci			= &pci_dev_ops_pci,
-	.init				= dw_i2c_device_init,
+	.read_resources		= pci_dev_read_resources,
+	.set_resources		= pci_dev_set_resources,
+	.enable_resources	= pci_dev_enable_resources,
+	.scan_bus		= scan_smbus,
+	.ops_i2c_bus		= &dw_i2c_bus_ops,
+	.ops_pci		= &pci_dev_ops_pci,
+	.init			= dw_i2c_device_init,
 #if CONFIG(HAVE_ACPI_TABLES)
-	.acpi_fill_ssdt_generator	= dw_i2c_acpi_fill_ssdt,
+	.acpi_fill_ssdt		= dw_i2c_acpi_fill_ssdt,
 #endif
 };
 
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index e65beb4a95..4cfd6f4839 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -108,16 +108,16 @@ static void pch_lpc_set_resources(struct device *dev)
 }
 
 static struct device_operations device_ops = {
-	.read_resources			= pch_lpc_read_resources,
-	.set_resources			= pch_lpc_set_resources,
-	.enable_resources		= pci_dev_enable_resources,
+	.read_resources		= pch_lpc_read_resources,
+	.set_resources		= pch_lpc_set_resources,
+	.enable_resources	= pci_dev_enable_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
-	.write_acpi_tables		= southbridge_write_acpi_tables,
-	.acpi_inject_dsdt_generator	= southbridge_inject_dsdt,
+	.write_acpi_tables	= southbridge_write_acpi_tables,
+	.acpi_inject_dsdt	= southbridge_inject_dsdt,
 #endif
-	.init				= lpc_soc_init,
-	.scan_bus			= scan_static_bus,
-	.ops_pci			= &pci_dev_ops_pci,
+	.init			= lpc_soc_init,
+	.scan_bus		= scan_static_bus,
+	.ops_pci		= &pci_dev_ops_pci,
 };
 
 static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index 56af940875..d529faaaca 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -54,13 +54,13 @@ static void sd_fill_ssdt(struct device *dev)
 #endif
 
 static struct device_operations dev_ops = {
-	.read_resources			= pci_dev_read_resources,
-	.set_resources			= pci_dev_set_resources,
-	.enable_resources		= pci_dev_enable_resources,
+	.read_resources		= pci_dev_read_resources,
+	.set_resources		= pci_dev_set_resources,
+	.enable_resources	= pci_dev_enable_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
-	.acpi_fill_ssdt_generator	= sd_fill_ssdt,
+	.acpi_fill_ssdt		= sd_fill_ssdt,
 #endif
-	.ops_pci			= &pci_dev_ops_pci,
+	.ops_pci		= &pci_dev_ops_pci,
 };
 
 static const unsigned short pci_device_ids[] = {