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>

25 files changed, 102 insertions, 102 deletions

diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index b1fbad01eb..32d1550e5b 100644
--- a/src/drivers/crb/tis.c
+++ b/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
 
 };
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 7f73cef40d..0a3d62357b 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -65,12 +65,12 @@ static const char *adau7002_acpi_name(const struct device *dev)
 #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 c68fa3a0d3..0ba2d53c82 100644
--- a/src/drivers/generic/generic/generic.c
+++ b/src/drivers/generic/generic/generic.c
@@ -78,11 +78,11 @@ static const char *generic_dev_acpi_name(const struct device *dev)
 }
 
 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 753a555a48..67c591386d 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -112,11 +112,11 @@ static const char *gpio_keys_acpi_name(const struct device *dev)
 }
 
 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 23c044de2a..b4761262e0 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/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)
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 56fd26c3fd..6f724f8937 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -80,12 +80,12 @@ static const char *max98357a_acpi_name(const struct device *dev)
 #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
 };
 
diff --git a/src/drivers/gfx/generic/generic.c b/src/drivers/gfx/generic/generic.c
index 9e952e8571..a20279f7af 100644
--- a/src/drivers/gfx/generic/generic.c
+++ b/src/drivers/gfx/generic/generic.c
@@ -151,8 +151,8 @@ 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_name	= gfx_acpi_name,
+	.acpi_fill_ssdt	= gfx_fill_ssdt_generator,
 };
 
 static void gfx_enable(struct device *dev)
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index f82cd9f6e7..5c67eda2d0 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -108,12 +108,12 @@ static const char *da7219_acpi_name(const struct device *dev)
 #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 0b36e5f11f..592e791ba9 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -190,12 +190,12 @@ static const char *i2c_generic_acpi_name(const struct device *dev)
 #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 b8185d062b..6e4169ebb9 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -47,12 +47,12 @@ static const char *i2c_hid_acpi_name(const struct device *dev)
 #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 48db3e1be4..71ba75b9fe 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -85,11 +85,11 @@ static const char *max98373_acpi_name(const struct device *dev)
 }
 
 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 1cc72d36cf..7979fe32a0 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -81,11 +81,11 @@ static const char *max98927_acpi_name(const struct device *dev)
 }
 
 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 33b3421318..5d56b243e1 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -96,12 +96,12 @@ static const char *nau8825_acpi_name(const struct device *dev)
 #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 8dc3cd9bb0..cfaeae8517 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/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)
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 6f4e032953..15014cda9e 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -85,11 +85,11 @@ static const char *rt5663_acpi_name(const struct device *dev)
 }
 
 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 9da687574f..781d09d94d 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -89,11 +89,11 @@ static const char *i2c_sx9310_acpi_name(const struct device *dev)
 }
 
 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 b13f66675b..d36e4c2932 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -72,11 +72,11 @@ static const char *i2c_tpm_acpi_name(const struct device *dev)
 }
 
 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)
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index d542bd371a..256b486dc8 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -40,10 +40,10 @@ static void ish_fill_ssdt_generator(struct device *dev)
 }
 
 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,
+	.read_resources		= DEVICE_NOOP,
+	.set_resources		= DEVICE_NOOP,
+	.enable_resources	= DEVICE_NOOP,
+	.acpi_fill_ssdt		= ish_fill_ssdt_generator,
 };
 
 static void intel_ish_enable(struct device *dev)
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 0cada814e9..92fa00b956 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -78,11 +78,11 @@ static const char *camera_acpi_name(const struct device *dev)
 }
 
 static struct device_operations camera_ops = {
-	.read_resources			= DEVICE_NOOP,
-	.set_resources			= DEVICE_NOOP,
-	.enable_resources		= DEVICE_NOOP,
-	.acpi_name			= camera_acpi_name,
-	.acpi_fill_ssdt_generator	= camera_fill_ssdt,
+	.read_resources		= DEVICE_NOOP,
+	.set_resources		= DEVICE_NOOP,
+	.enable_resources	= DEVICE_NOOP,
+	.acpi_name		= camera_acpi_name,
+	.acpi_fill_ssdt		= camera_fill_ssdt,
 };
 
 static void camera_enable(struct device *dev)
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index e5efbe15fb..af7407df2f 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -90,17 +90,17 @@ static struct pci_operations pci_ops = {
 };
 
 struct device_operations device_ops = {
-	.read_resources           = pci_dev_read_resources,
-	.set_resources            = pci_dev_set_resources,
-	.enable_resources         = pci_dev_enable_resources,
-	.init                     = wifi_pci_dev_init,
+	.read_resources   = pci_dev_read_resources,
+	.set_resources    = pci_dev_set_resources,
+	.enable_resources = pci_dev_enable_resources,
+	.init             = wifi_pci_dev_init,
 #if CONFIG(GENERATE_SMBIOS_TABLES)
-	.get_smbios_data          = smbios_write_wifi,
+	.get_smbios_data  = smbios_write_wifi,
 #endif
-	.ops_pci                  = &pci_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_name        = generic_wifi_acpi_name,
+	.acpi_fill_ssdt   = intel_wifi_fill_ssdt,
 #endif
 };
 
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c
index e0fa1b0120..e5f60fe6b8 100644
--- a/src/drivers/ipmi/ipmi_kcs_ops.c
+++ b/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,
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index a3e1e1b049..c764b433b6 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -374,8 +374,8 @@ static struct device_operations r8168_ops  = {
 	.init             = r8168_init,
 	.scan_bus         = 0,
 #if CONFIG(HAVE_ACPI_TABLES)
-	.acpi_name                = r8168_net_acpi_name,
-	.acpi_fill_ssdt_generator = r8168_net_fill_ssdt,
+	.acpi_name        = r8168_net_acpi_name,
+	.acpi_fill_ssdt   = r8168_net_fill_ssdt,
 #endif
 };
 
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index a35ef83d2c..b9fd0cf006 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -988,8 +988,8 @@ static struct device_operations lpc_tpm_ops = {
 	.read_resources   = lpc_tpm_read_resources,
 	.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_name        = lpc_tpm_acpi_name,
+	.acpi_fill_ssdt   = lpc_tpm_fill_ssdt,
 #endif
 };
 
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 7e107d6f67..30a81262ce 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -200,11 +200,11 @@ static const char *spi_acpi_name(const struct device *dev)
 }
 
 static struct device_operations spi_acpi_ops = {
-	.read_resources		  = DEVICE_NOOP,
-	.set_resources		  = DEVICE_NOOP,
-	.enable_resources	  = DEVICE_NOOP,
-	.acpi_name		  = spi_acpi_name,
-	.acpi_fill_ssdt_generator = spi_acpi_fill_ssdt_generator,
+	.read_resources		= DEVICE_NOOP,
+	.set_resources		= DEVICE_NOOP,
+	.enable_resources	= DEVICE_NOOP,
+	.acpi_name		= spi_acpi_name,
+	.acpi_fill_ssdt		= spi_acpi_fill_ssdt_generator,
 };
 
 static void spi_acpi_enable(struct device *dev)
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index a312c88b69..2402e8bd12 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -80,11 +80,11 @@ static void usb_acpi_fill_ssdt_generator(struct device *dev)
 }
 
 static struct device_operations usb_acpi_ops = {
-	.read_resources			= DEVICE_NOOP,
-	.set_resources			= DEVICE_NOOP,
-	.enable_resources		= DEVICE_NOOP,
-	.scan_bus			= scan_static_bus,
-	.acpi_fill_ssdt_generator	= usb_acpi_fill_ssdt_generator,
+	.read_resources		= DEVICE_NOOP,
+	.set_resources		= DEVICE_NOOP,
+	.enable_resources	= DEVICE_NOOP,
+	.scan_bus		= scan_static_bus,
+	.acpi_fill_ssdt		= usb_acpi_fill_ssdt_generator,
 };
 
 static void usb_acpi_enable(struct device *dev)