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>

src/arch/x86/acpi.c

@@ -430,8 +430,8 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id)
 	{
 		struct device *dev;
 		for (dev = all_devices; dev; dev = dev->next)
-			if (dev->ops && dev->ops->acpi_fill_ssdt_generator)
-				dev->ops->acpi_fill_ssdt_generator(dev);
+			if (dev->ops && dev->ops->acpi_fill_ssdt)
+				dev->ops->acpi_fill_ssdt(dev);
 		current = (unsigned long) acpigen_get_current();
 	}
 
@@ -1366,8 +1366,8 @@ unsigned long write_acpi_tables(unsigned long start)
 
 		acpigen_set_current((char *) current);
 		for (dev = all_devices; dev; dev = dev->next)
-			if (dev->ops && dev->ops->acpi_inject_dsdt_generator)
-				dev->ops->acpi_inject_dsdt_generator(dev);
+			if (dev->ops && dev->ops->acpi_inject_dsdt)
+				dev->ops->acpi_inject_dsdt(dev);
 		current = (unsigned long) acpigen_get_current();
 		memcpy((char *)current,
 		       (char *)dsdt_file + sizeof(acpi_header_t),

src/device/pci_device.c

@@ -768,7 +768,7 @@ struct device_operations default_pci_ops_dev = {
 	.enable_resources = pci_dev_enable_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.write_acpi_tables = pci_rom_write_acpi_tables,
-	.acpi_fill_ssdt_generator = pci_rom_ssdt,
+	.acpi_fill_ssdt    = pci_rom_ssdt,
 #endif
 	.init             = pci_dev_init,
 	.scan_bus         = 0,

src/drivers/crb/tis.c

@@ -141,7 +141,7 @@ static struct device_operations __unused crb_ops = {
 	.set_resources = DEVICE_NOOP,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name = crb_tpm_acpi_name,
-	.acpi_fill_ssdt_generator = crb_tpm_fill_ssdt,
+	.acpi_fill_ssdt = crb_tpm_fill_ssdt,
 #endif
 
 };

src/drivers/generic/adau7002/adau7002.c

@@ -70,7 +70,7 @@ static struct device_operations adau7002_ops = {
 	.enable_resources	= DEVICE_NOOP,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= adau7002_acpi_name,
-	.acpi_fill_ssdt_generator	= adau7002_fill_ssdt,
+	.acpi_fill_ssdt		= adau7002_fill_ssdt,
 #endif
 };
 

src/drivers/generic/generic/generic.c

@@ -82,7 +82,7 @@ static struct device_operations generic_dev_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= generic_dev_acpi_name,
-	.acpi_fill_ssdt_generator	= generic_dev_fill_ssdt_generator,
+	.acpi_fill_ssdt		= generic_dev_fill_ssdt_generator,
 };
 
 static void generic_dev_enable(struct device *dev)

src/drivers/generic/gpio_keys/gpio_keys.c

@@ -116,7 +116,7 @@ static struct device_operations gpio_keys_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= gpio_keys_acpi_name,
-	.acpi_fill_ssdt_generator	= gpio_keys_fill_ssdt_generator,
+	.acpi_fill_ssdt		= gpio_keys_fill_ssdt_generator,
 };
 
 static void gpio_keys_enable(struct device *dev)

src/drivers/generic/gpio_regulator/gpio_regulator.c

@@ -73,7 +73,7 @@ static struct device_operations gpio_regulator_ops = {
 	.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)

src/drivers/generic/max98357a/max98357a.c

@@ -85,7 +85,7 @@ static struct device_operations max98357a_ops = {
 	.enable_resources	= DEVICE_NOOP,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= max98357a_acpi_name,
-	.acpi_fill_ssdt_generator = max98357a_fill_ssdt,
+	.acpi_fill_ssdt		= max98357a_fill_ssdt,
 #endif
 };
 

src/drivers/gfx/generic/generic.c

@@ -152,7 +152,7 @@ static const char *gfx_acpi_name(const struct device *dev)
 
 static struct device_operations gfx_ops = {
 	.acpi_name	= gfx_acpi_name,
-	.acpi_fill_ssdt_generator = gfx_fill_ssdt_generator,
+	.acpi_fill_ssdt	= gfx_fill_ssdt_generator,
 };
 
 static void gfx_enable(struct device *dev)

src/drivers/i2c/da7219/da7219.c

@@ -113,7 +113,7 @@ static struct device_operations da7219_ops = {
 	.enable_resources	= DEVICE_NOOP,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= da7219_acpi_name,
-	.acpi_fill_ssdt_generator = da7219_fill_ssdt,
+	.acpi_fill_ssdt		= da7219_fill_ssdt,
 #endif
 };
 

src/drivers/i2c/generic/generic.c

@@ -195,7 +195,7 @@ static struct device_operations i2c_generic_ops = {
 	.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_fill_ssdt		= i2c_generic_fill_ssdt_generator,
 #endif
 };
 

src/drivers/i2c/hid/hid.c

@@ -52,7 +52,7 @@ static struct device_operations i2c_hid_ops = {
 	.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_fill_ssdt		= i2c_hid_fill_ssdt_generator,
 #endif
 };
 

src/drivers/i2c/max98373/max98373.c

@@ -89,7 +89,7 @@ static struct device_operations max98373_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= max98373_acpi_name,
-	.acpi_fill_ssdt_generator = max98373_fill_ssdt,
+	.acpi_fill_ssdt		= max98373_fill_ssdt,
 };
 
 static void max98373_enable(struct device *dev)

src/drivers/i2c/max98927/max98927.c

@@ -85,7 +85,7 @@ static struct device_operations max98927_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= max98927_acpi_name,
-	.acpi_fill_ssdt_generator = max98927_fill_ssdt,
+	.acpi_fill_ssdt		= max98927_fill_ssdt,
 };
 
 static void max98927_enable(struct device *dev)

src/drivers/i2c/nau8825/nau8825.c

@@ -101,7 +101,7 @@ static struct device_operations nau8825_ops = {
 	.enable_resources	= DEVICE_NOOP,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name              = nau8825_acpi_name,
-	.acpi_fill_ssdt_generator = nau8825_fill_ssdt,
+	.acpi_fill_ssdt		= nau8825_fill_ssdt,
 #endif
 };
 

src/drivers/i2c/rt1011/rt1011.c

@@ -99,7 +99,7 @@ static struct device_operations rt1011_ops = {
 	.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)

src/drivers/i2c/rt5663/rt5663.c

@@ -89,7 +89,7 @@ static struct device_operations rt5663_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= rt5663_acpi_name,
-	.acpi_fill_ssdt_generator	= rt5663_fill_ssdt,
+	.acpi_fill_ssdt		= rt5663_fill_ssdt,
 };
 
 static void rt5663_enable(struct device *dev)

src/drivers/i2c/sx9310/sx9310.c

@@ -93,7 +93,7 @@ static struct device_operations i2c_sx9310_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= i2c_sx9310_acpi_name,
-	.acpi_fill_ssdt_generator = i2c_sx9310_fill_ssdt,
+	.acpi_fill_ssdt		= i2c_sx9310_fill_ssdt,
 };
 
 static void i2c_sx9310_enable(struct device *dev)

src/drivers/i2c/tpm/chip.c

@@ -76,7 +76,7 @@ static struct device_operations i2c_tpm_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= i2c_tpm_acpi_name,
-	.acpi_fill_ssdt_generator = i2c_tpm_fill_ssdt,
+	.acpi_fill_ssdt		= i2c_tpm_fill_ssdt,
 };
 
 static void i2c_tpm_enable(struct device *dev)

src/drivers/intel/ish/ish.c

@@ -43,7 +43,7 @@ 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,
+	.acpi_fill_ssdt		= ish_fill_ssdt_generator,
 };
 
 static void intel_ish_enable(struct device *dev)

src/drivers/intel/mipi_camera/camera.c

@@ -82,7 +82,7 @@ static struct device_operations camera_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= camera_acpi_name,
-	.acpi_fill_ssdt_generator	= camera_fill_ssdt,
+	.acpi_fill_ssdt		= camera_fill_ssdt,
 };
 
 static void camera_enable(struct device *dev)

src/drivers/intel/wifi/wifi.c

@@ -100,7 +100,7 @@ struct device_operations device_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_fill_ssdt   = intel_wifi_fill_ssdt,
 #endif
 };
 

src/drivers/ipmi/ipmi_kcs_ops.c

@@ -362,7 +362,7 @@ static struct device_operations ops = {
 	.init             = ipmi_kcs_init,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.write_acpi_tables = ipmi_write_acpi_tables,
-	.acpi_fill_ssdt_generator = ipmi_ssdt,
+	.acpi_fill_ssdt    = ipmi_ssdt,
 #endif
 #if CONFIG(GENERATE_SMBIOS_TABLES)
 	.get_smbios_data = ipmi_smbios_data,

src/drivers/net/r8168.c

@@ -375,7 +375,7 @@ static struct device_operations r8168_ops  = {
 	.scan_bus         = 0,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name        = r8168_net_acpi_name,
-	.acpi_fill_ssdt_generator = r8168_net_fill_ssdt,
+	.acpi_fill_ssdt   = r8168_net_fill_ssdt,
 #endif
 };
 

src/drivers/pc80/tpm/tis.c

@@ -989,7 +989,7 @@ static struct device_operations lpc_tpm_ops = {
 	.set_resources    = lpc_tpm_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name        = lpc_tpm_acpi_name,
-	.acpi_fill_ssdt_generator = lpc_tpm_fill_ssdt,
+	.acpi_fill_ssdt   = lpc_tpm_fill_ssdt,
 #endif
 };
 

src/drivers/spi/acpi/acpi.c

@@ -204,7 +204,7 @@ static struct device_operations spi_acpi_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.acpi_name		= spi_acpi_name,
-	.acpi_fill_ssdt_generator = spi_acpi_fill_ssdt_generator,
+	.acpi_fill_ssdt		= spi_acpi_fill_ssdt_generator,
 };
 
 static void spi_acpi_enable(struct device *dev)

src/drivers/usb/acpi/usb_acpi.c

@@ -84,7 +84,7 @@ static struct device_operations usb_acpi_ops = {
 	.set_resources		= DEVICE_NOOP,
 	.enable_resources	= DEVICE_NOOP,
 	.scan_bus		= scan_static_bus,
-	.acpi_fill_ssdt_generator	= usb_acpi_fill_ssdt_generator,
+	.acpi_fill_ssdt		= usb_acpi_fill_ssdt_generator,
 };
 
 static void usb_acpi_enable(struct device *dev)

src/ec/google/chromeec/ec_lpc.c

@@ -453,7 +453,7 @@ static struct device_operations ops = {
 	.set_resources    = DEVICE_NOOP,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name        = google_chromeec_acpi_name,
-	.acpi_fill_ssdt_generator	= google_chromeec_fill_ssdt_generator,
+	.acpi_fill_ssdt   = google_chromeec_fill_ssdt_generator,
 #endif
 };
 

src/ec/google/wilco/chip.c

@@ -232,7 +232,7 @@ static struct device_operations ops = {
 	.read_resources		= wilco_ec_read_resources,
 	.enable_resources	= DEVICE_NOOP,
 	.set_resources		= DEVICE_NOOP,
-	.acpi_fill_ssdt_generator	= wilco_ec_fill_ssdt_generator,
+	.acpi_fill_ssdt		= wilco_ec_fill_ssdt_generator,
 	.acpi_name		= wilco_ec_acpi_name,
 };
 

src/ec/lenovo/h8/h8.c

@@ -227,7 +227,7 @@ struct device_operations h8_dev_ops = {
 	.get_smbios_strings = h8_smbios_strings,
 #endif
 #if CONFIG(HAVE_ACPI_TABLES)
-	.acpi_fill_ssdt_generator = h8_ssdt_generator,
+	.acpi_fill_ssdt = h8_ssdt_generator,
 	.acpi_name = h8_acpi_name,
 #endif
 	.init = h8_init,

src/include/device/device.h

@@ -50,8 +50,8 @@ struct device_operations {
 #if CONFIG(HAVE_ACPI_TABLES)
 	unsigned long (*write_acpi_tables)(struct device *dev,
 		unsigned long start, struct acpi_rsdp *rsdp);
-	void (*acpi_fill_ssdt_generator)(struct device *dev);
-	void (*acpi_inject_dsdt_generator)(struct device *dev);
+	void (*acpi_fill_ssdt)(struct device *dev);
+	void (*acpi_inject_dsdt)(struct device *dev);
 	const char *(*acpi_name)(const struct device *dev);
 	/* Returns the optional _HID (Hardware ID) */
 	const char *(*acpi_hid)(const struct device *dev);

src/mainboard/google/auron/mainboard.c

@@ -41,7 +41,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/google/beltino/mainboard.c

@@ -40,7 +40,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/butterfly/mainboard.c

@@ -271,7 +271,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = butterfly_onboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/google/cyan/mainboard.c

@@ -28,7 +28,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 

src/mainboard/google/dedede/mainboard.c

@@ -35,7 +35,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_dev_init;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/deltaur/mainboard.c

@@ -14,7 +14,7 @@
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 static void mainboard_chip_init(void *chip_info)

src/mainboard/google/dragonegg/mainboard.c

@@ -34,7 +34,7 @@ static void mainboard_init(void *chip_info)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->write_acpi_tables = NULL;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/drallion/ramstage.c

@@ -69,7 +69,7 @@ static void mainboard_init(void *chip_info)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/eve/mainboard.c

@@ -70,7 +70,7 @@ static unsigned long mainboard_write_acpi_tables(
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 }
 

src/mainboard/google/fizz/mainboard.c

@@ -230,7 +230,7 @@ static void mainboard_enable(struct device *dev)
 	mainboard_set_power_limits(conf);
 
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 }
 

src/mainboard/google/glados/mainboard.c

@@ -108,7 +108,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 static void mainboard_chip_init(void *chip_info)

src/mainboard/google/hatch/ramstage.c

@@ -48,7 +48,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	variant_mainboard_enable(dev);
 }
 

src/mainboard/google/jecht/mainboard.c

@@ -34,7 +34,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/kahlee/mainboard.c

@@ -169,7 +169,7 @@ static void kahlee_enable(struct device *dev)
 	/* Initialize the PIRQ data structures for consumption */
 	pirq_setup();
 
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 

src/mainboard/google/link/mainboard.c

@@ -184,7 +184,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = link_onboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 #if CONFIG(VGA_ROM_RUN)
 	/* Install custom int15 handler for VGA OPROM */
 	mainboard_interrupt_handlers(0x15, &int15_handler);

src/mainboard/google/octopus/mainboard.c

@@ -108,7 +108,7 @@ static unsigned long mainboard_write_acpi_tables(
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/parrot/mainboard.c

@@ -74,7 +74,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = parrot_onboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/google/poppy/mainboard.c

@@ -59,7 +59,7 @@ static unsigned long mainboard_write_acpi_tables(struct device *device,
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 }
 

src/mainboard/google/rambi/mainboard.c

@@ -161,7 +161,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 #if CONFIG(VGA_ROM_RUN)
 	/* Install custom int15 handler for VGA OPROM */
 	mainboard_interrupt_handlers(0x15, &int15_handler);

src/mainboard/google/reef/mainboard.c

@@ -137,7 +137,7 @@ static unsigned long mainboard_write_acpi_tables(
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/sarien/ramstage.c

@@ -81,7 +81,7 @@ static void mainboard_init(void *chip_info)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/google/slippy/mainboard.c

@@ -81,7 +81,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = mainboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/google/stout/mainboard.c

@@ -57,7 +57,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/google/volteer/mainboard.c

@@ -24,7 +24,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 static void mainboard_chip_init(void *chip_info)

src/mainboard/intel/baskingridge/mainboard.c

@@ -31,7 +31,7 @@ void mainboard_suspend_resume(void)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/intel/cannonlake_rvp/mainboard.c

@@ -58,7 +58,7 @@ static unsigned long mainboard_write_acpi_tables(struct device *device,
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/coffeelake_rvp/mainboard.c

@@ -57,7 +57,7 @@ static unsigned long mainboard_write_acpi_tables(struct device *device,
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/emeraldlake2/mainboard.c

@@ -24,7 +24,7 @@
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/intel/glkrvp/mainboard.c

@@ -67,7 +67,7 @@ static unsigned long mainboard_write_acpi_tables(
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/icelake_rvp/mainboard.c

@@ -30,7 +30,7 @@ static void mainboard_init(void *chip_info)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/jasperlake_rvp/mainboard.c

@@ -29,7 +29,7 @@ static void mainboard_init(void *chip_info)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/kblrvp/mainboard.c

@@ -33,7 +33,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/kunimitsu/mainboard.c

@@ -95,7 +95,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/strago/mainboard.c

@@ -30,7 +30,7 @@ static void mainboard_init(struct device *dev)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 

src/mainboard/intel/tglrvp/mainboard.c

@@ -40,7 +40,7 @@ static void mainboard_init(void *chip_info)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/intel/wtm2/mainboard.c

@@ -30,7 +30,7 @@ void mainboard_suspend_resume(void)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/lenovo/x200/mainboard.c

@@ -28,7 +28,7 @@ static void mainboard_enable(struct device *dev)
 					GMA_INT15_PANEL_FIT_CENTERING,
 					GMA_INT15_BOOT_DISPLAY_DEFAULT, 2);
 
-	dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
+	dev->ops->acpi_fill_ssdt = fill_ssdt;
 	if (CONFIG(BOARD_LENOVO_X200))
 		init_dock();
 }

src/mainboard/lenovo/x201/mainboard.c

@@ -29,7 +29,7 @@ static void fill_ssdt(struct device *device)
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
+	dev->ops->acpi_fill_ssdt = fill_ssdt;
 
 	/* If we're resuming from suspend, blink suspend LED */
 	if (acpi_is_wakeup_s3())

src/mainboard/lenovo/x60/mainboard.c

@@ -119,7 +119,7 @@ static void fill_ssdt(struct device *device)
 static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
+	dev->ops->acpi_fill_ssdt = fill_ssdt;
 }
 
 struct chip_operations mainboard_ops = {

src/mainboard/samsung/lumpy/mainboard.c

@@ -90,7 +90,7 @@ static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mainboard_init;
 	dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/mainboard/samsung/stumpy/mainboard.c

@@ -23,7 +23,7 @@
 
 static void mainboard_enable(struct device *dev)
 {
-	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+	dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator;
 	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_EDP, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
 }
 

src/northbridge/amd/agesa/family14/northbridge.c

@@ -807,7 +807,7 @@ static struct device_operations northbridge_operations = {
 	.read_resources = nb_read_resources,
 	.set_resources = nb_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.init = northbridge_init,
 	.enable = 0,.ops_pci = 0,

src/northbridge/amd/agesa/family15tn/northbridge.c

@@ -561,7 +561,7 @@ static struct device_operations northbridge_operations = {
 	.set_resources	  = nb_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = DEVICE_NOOP,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/northbridge/amd/agesa/family16kb/northbridge.c

@@ -560,7 +560,7 @@ static struct device_operations northbridge_operations = {
 	.set_resources	  = set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = DEVICE_NOOP,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/northbridge/amd/pi/00630F01/northbridge.c

@@ -555,7 +555,7 @@ static struct device_operations northbridge_operations = {
 	.set_resources	  = set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = DEVICE_NOOP,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/northbridge/amd/pi/00660F01/northbridge.c

@@ -545,7 +545,7 @@ static struct device_operations northbridge_operations = {
 	.set_resources	  = set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = northbridge_init,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/northbridge/amd/pi/00730F01/northbridge.c

@@ -775,7 +775,7 @@ static struct device_operations northbridge_operations = {
 	.set_resources	  = set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = northbridge_init,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/northbridge/intel/gm45/gma.c

@@ -279,7 +279,7 @@ static struct device_operations gma_func0_ops = {
 	.read_resources = pci_dev_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt = gma_ssdt,
 	.init = gma_func0_init,
 	.scan_bus = 0,
 	.enable = 0,

src/northbridge/intel/gm45/northbridge.c

@@ -233,7 +233,7 @@ static struct device_operations pci_domain_ops = {
 	.init             = mch_domain_init,
 	.scan_bus         = pci_domain_scan_bus,
 	.write_acpi_tables = northbridge_write_acpi_tables,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt   = generate_cpu_entries,
 	.acpi_name        = northbridge_acpi_name,
 };
 

src/northbridge/intel/haswell/gma.c

@@ -577,7 +577,7 @@ static struct device_operations gma_func0_ops = {
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
 	.init                   = gma_func0_init,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt		= gma_ssdt,
 	.scan_bus               = NULL,
 	.enable                 = NULL,
 	.ops_pci                = &gma_pci_ops,

src/northbridge/intel/haswell/northbridge.c

@@ -476,7 +476,7 @@ static struct device_operations mc_ops = {
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
 	.init                   = northbridge_init,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt		= generate_cpu_entries,
 	.scan_bus               = NULL,
 	.ops_pci                = &intel_pci_ops,
 };

src/northbridge/intel/i945/gma.c

@@ -829,7 +829,7 @@ static struct device_operations gma_func0_ops = {
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.init			= gma_func0_init,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt		= gma_ssdt,
 	.scan_bus		= 0,
 	.enable			= 0,
 	.disable		= gma_func0_disable,

src/northbridge/intel/i945/northbridge.c

@@ -195,7 +195,7 @@ static struct device_operations mc_ops = {
 	.read_resources   = mc_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt   = generate_cpu_entries,
 	.scan_bus         = 0,
 	.ops_pci          = &intel_pci_ops,
 };

src/northbridge/intel/ironlake/gma.c

@@ -269,7 +269,7 @@ static struct device_operations gma_func0_ops = {
 	.read_resources = gma_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt = gma_ssdt,
 	.init = gma_func0_init,
 	.scan_bus = 0,
 	.enable = 0,

src/northbridge/intel/ironlake/northbridge.c

@@ -255,7 +255,7 @@ static struct device_operations mc_ops = {
 	.set_resources = mc_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = northbridge_init,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt = generate_cpu_entries,
 	.scan_bus = 0,
 	.ops_pci = &intel_pci_ops,
 };

src/northbridge/intel/pineview/gma.c

@@ -337,7 +337,7 @@ static struct device_operations gma_func0_ops = {
 	.read_resources         = pci_dev_read_resources,
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = NULL,
+	.acpi_fill_ssdt		= NULL,
 	.init                   = gma_func0_init,
 	.scan_bus               = NULL,
 	.enable                 = NULL,

src/northbridge/intel/pineview/northbridge.c

@@ -188,7 +188,7 @@ static struct device_operations pci_domain_ops = {
 	.set_resources	= mch_domain_set_resources,
 	.init		= mch_domain_init,
 	.scan_bus	= pci_domain_scan_bus,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt	= generate_cpu_entries,
 	.acpi_name	= northbridge_acpi_name,
 };
 

src/northbridge/intel/sandybridge/gma.c

@@ -710,7 +710,7 @@ static struct device_operations gma_func0_ops = {
 	.read_resources         = pci_dev_read_resources,
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt		= gma_ssdt,
 	.init                   = gma_func0_init,
 	.scan_bus               = NULL,
 	.enable                 = NULL,

src/northbridge/intel/sandybridge/northbridge.c

@@ -446,7 +446,7 @@ static struct device_operations mc_ops = {
 	.init                   = northbridge_init,
 	.scan_bus               = NULL,
 	.ops_pci                = &intel_pci_ops,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt		= generate_cpu_entries,
 };
 
 static const unsigned short pci_device_ids[] = {

src/northbridge/intel/x4x/gma.c

@@ -149,7 +149,7 @@ static struct device_operations gma_func0_ops = {
 	.read_resources = pci_dev_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = gma_ssdt,
+	.acpi_fill_ssdt = gma_ssdt,
 	.init = gma_func0_init,
 	.ops_pci = &gma_pci_ops,
 	.disable = gma_func0_disable,

src/northbridge/intel/x4x/northbridge.c

@@ -183,7 +183,7 @@ static struct device_operations pci_domain_ops = {
 	.init             = mch_domain_init,
 	.scan_bus         = pci_domain_scan_bus,
 	.write_acpi_tables = northbridge_write_acpi_tables,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt   = generate_cpu_entries,
 	.acpi_name        = northbridge_acpi_name,
 };
 

src/soc/amd/common/block/lpc/lpc.c

@@ -325,7 +325,7 @@ static struct device_operations lpc_ops = {
 	.read_resources = lpc_read_resources,
 	.set_resources = lpc_set_resources,
 	.enable_resources = lpc_enable_resources,
-	.acpi_inject_dsdt_generator = southbridge_inject_dsdt,
+	.acpi_inject_dsdt = southbridge_inject_dsdt,
 	.write_acpi_tables = southbridge_write_acpi_tables,
 	.init = lpc_init,
 	.scan_bus = scan_static_bus,

src/soc/amd/picasso/chip.c

@@ -34,7 +34,7 @@ struct device_operations cpu_bus_ops = {
 	.set_resources	  = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init		  = picasso_init_cpus,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt   = generate_cpu_entries,
 };
 
 const char *soc_acpi_name(const struct device *dev)

src/soc/amd/picasso/i2c.c

@@ -144,7 +144,7 @@ struct device_operations picasso_i2c_mmio_ops = {
 	.enable_resources = DEVICE_NOOP,
 	.scan_bus = scan_smbus,
 	.acpi_name = i2c_acpi_name,
-	.acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt,
+	.acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
 };
 
 /*

src/soc/amd/picasso/northbridge.c

@@ -203,7 +203,7 @@ static struct device_operations northbridge_operations = {
 	.read_resources	  = read_resources,
 	.set_resources	  = set_resources,
 	.enable_resources = pci_dev_enable_resources,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/soc/amd/stoneyridge/chip.c

@@ -39,7 +39,7 @@ struct device_operations cpu_bus_ops = {
 	.set_resources	  = DEVICE_NOOP,
 	.enable_resources = DEVICE_NOOP,
 	.init		  = stoney_init_cpus,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt   = generate_cpu_entries,
 };
 
 const char *soc_acpi_name(const struct device *dev)

src/soc/amd/stoneyridge/i2c.c

@@ -141,7 +141,7 @@ struct device_operations stoneyridge_i2c_mmio_ops = {
 	.enable_resources = DEVICE_NOOP,
 	.scan_bus = scan_smbus,
 	.acpi_name = i2c_acpi_name,
-	.acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt,
+	.acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
 };
 
 /*

src/soc/amd/stoneyridge/northbridge.c

@@ -356,7 +356,7 @@ static struct device_operations northbridge_operations = {
 	.set_resources	  = set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init		  = northbridge_init,
-	.acpi_fill_ssdt_generator = northbridge_fill_ssdt_generator,
+	.acpi_fill_ssdt   = northbridge_fill_ssdt_generator,
 	.write_acpi_tables = agesa_write_acpi_tables,
 	.enable		  = 0,
 	.ops_pci	  = 0,

src/soc/intel/apollolake/chip.c

@@ -226,7 +226,7 @@ static struct device_operations cpu_bus_ops = {
 	.enable_resources = DEVICE_NOOP,
 	.init = apollolake_init_cpus,
 	.scan_bus = NULL,
-	.acpi_fill_ssdt_generator = generate_cpu_entries,
+	.acpi_fill_ssdt = generate_cpu_entries,
 };
 
 static void enable_dev(struct device *dev)