Replace DEVICE_NOOP with noop_(set|read)_resources

`.read_resources` and `.set_resources` are the only two device
operations that are considered mandatory. Other function pointers
can be left NULL. Having dedicated no-op implementations for the
two mandatory fields should stop the leaking of no-op pointers to
other fields.

Change-Id: I6469a7568dc24317c95e238749d878e798b0a362
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40207
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

80 files changed, 150 insertions, 150 deletions

diff --git a/src/device/root_device.c b/src/device/root_device.c
index 68a7ae668f..49aa3d8be5 100644
--- a/src/device/root_device.c
+++ b/src/device/root_device.c
@@ -127,8 +127,8 @@ static const char *root_dev_acpi_name(const struct device *dev)
  * of a motherboard can override this if you want non-default behavior.
  */
 struct device_operations default_dev_ops_root = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.scan_bus         = scan_static_bus,
 	.reset_bus        = root_dev_reset,
 #if CONFIG(HAVE_ACPI_TABLES)
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index 5c1a6df1cf..bd54bb6b54 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -127,8 +127,8 @@ static const char *crb_tpm_acpi_name(const struct device *dev)
 }
 
 static struct device_operations __unused crb_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name = crb_tpm_acpi_name,
 	.acpi_fill_ssdt = crb_tpm_fill_ssdt,
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 97bd37d871..aa47ae6bb9 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -55,8 +55,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= adau7002_acpi_name,
 	.acpi_fill_ssdt		= adau7002_fill_ssdt,
diff --git a/src/drivers/generic/generic/generic.c b/src/drivers/generic/generic/generic.c
index d4de6c7583..cee41a538b 100644
--- a/src/drivers/generic/generic/generic.c
+++ b/src/drivers/generic/generic/generic.c
@@ -68,8 +68,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= generic_dev_acpi_name,
 	.acpi_fill_ssdt		= generic_dev_fill_ssdt_generator,
 };
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 5a74c6409b..b8e72bf328 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -102,8 +102,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= gpio_keys_acpi_name,
 	.acpi_fill_ssdt		= gpio_keys_fill_ssdt_generator,
 };
diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c
index 7041aa0e7c..0f39910b85 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/src/drivers/generic/gpio_regulator/gpio_regulator.c
@@ -59,8 +59,8 @@ static const char *gpio_regulator_acpi_name(const struct device *dev)
 }
 
 static struct device_operations gpio_regulator_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.acpi_name = gpio_regulator_acpi_name,
 	.acpi_fill_ssdt = gpio_regulator_fill_ssdt_generator,
 };
diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c
index b2c4bb60b1..c8be606458 100644
--- a/src/drivers/generic/ioapic/ioapic.c
+++ b/src/drivers/generic/ioapic/ioapic.c
@@ -95,7 +95,7 @@ static void ioapic_read_resources(struct device *dev)
 
 static struct device_operations ioapic_operations = {
 	.read_resources   = ioapic_read_resources,
-	.set_resources    = DEVICE_NOOP,
+	.set_resources    = noop_set_resources,
 	.init             = ioapic_init,
 };
 
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 0a29367498..599acb5afe 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -70,8 +70,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= max98357a_acpi_name,
 	.acpi_fill_ssdt		= max98357a_fill_ssdt,
diff --git a/src/drivers/i2c/adt7463/adt7463.c b/src/drivers/i2c/adt7463/adt7463.c
index 3e1a3a5859..2fcd54e647 100644
--- a/src/drivers/i2c/adt7463/adt7463.c
+++ b/src/drivers/i2c/adt7463/adt7463.c
@@ -78,8 +78,8 @@ static void adt7463_init(struct device *adt7463)
 }
 
 static struct device_operations adt7463_operations = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = adt7463_init,
 };
 
diff --git a/src/drivers/i2c/at24rf08c/at24rf08c.c b/src/drivers/i2c/at24rf08c/at24rf08c.c
index 3841d64fd6..3511502b76 100644
--- a/src/drivers/i2c/at24rf08c/at24rf08c.c
+++ b/src/drivers/i2c/at24rf08c/at24rf08c.c
@@ -33,8 +33,8 @@ static void at24rf08c_init(struct device *dev)
 }
 
 static struct device_operations at24rf08c_operations = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = at24rf08c_init,
 };
 
diff --git a/src/drivers/i2c/ck505/ck505.c b/src/drivers/i2c/ck505/ck505.c
index fac5208577..147776d3f4 100644
--- a/src/drivers/i2c/ck505/ck505.c
+++ b/src/drivers/i2c/ck505/ck505.c
@@ -46,8 +46,8 @@ static void ck505_init(struct device *dev)
 }
 
 static struct device_operations ck505_operations = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= ck505_init,
 };
 
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 43c6f9d41b..4cfeb9fb72 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -98,8 +98,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= da7219_acpi_name,
 	.acpi_fill_ssdt		= da7219_fill_ssdt,
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 32b984a85f..0466a6fe31 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -180,8 +180,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= i2c_generic_acpi_name,
 	.acpi_fill_ssdt		= i2c_generic_fill_ssdt_generator,
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index 11d9d18298..de43eb9ba5 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -37,8 +37,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name		= i2c_hid_acpi_name,
 	.acpi_fill_ssdt		= i2c_hid_fill_ssdt_generator,
diff --git a/src/drivers/i2c/lm96000/lm96000.c b/src/drivers/i2c/lm96000/lm96000.c
index 54d2b88e7c..b1cf06eca2 100644
--- a/src/drivers/i2c/lm96000/lm96000.c
+++ b/src/drivers/i2c/lm96000/lm96000.c
@@ -205,8 +205,8 @@ static void lm96000_init(struct device *const dev)
 }
 
 static struct device_operations lm96000_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= lm96000_init,
 };
 
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index c6fa2e48d4..a7df56baa0 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -75,8 +75,8 @@ static const char *max98373_acpi_name(const struct device *dev)
 }
 
 static struct device_operations max98373_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= max98373_acpi_name,
 	.acpi_fill_ssdt		= max98373_fill_ssdt,
 };
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index 166a4ef87b..0cb80ae88a 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -71,8 +71,8 @@ static const char *max98927_acpi_name(const struct device *dev)
 }
 
 static struct device_operations max98927_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= max98927_acpi_name,
 	.acpi_fill_ssdt		= max98927_fill_ssdt,
 };
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 0c893a44cb..c3e95e7506 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -86,8 +86,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name              = nau8825_acpi_name,
 	.acpi_fill_ssdt		= nau8825_fill_ssdt,
diff --git a/src/drivers/i2c/nct7802y/nct7802y.c b/src/drivers/i2c/nct7802y/nct7802y.c
index c21b002ba5..dd8c0aabc0 100644
--- a/src/drivers/i2c/nct7802y/nct7802y.c
+++ b/src/drivers/i2c/nct7802y/nct7802y.c
@@ -20,8 +20,8 @@ static void nct7802y_init(struct device *const dev)
 }
 
 static struct device_operations nct7802y_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= nct7802y_init,
 };
 
diff --git a/src/drivers/i2c/pca9538/pca9538.c b/src/drivers/i2c/pca9538/pca9538.c
index 68283b8006..b16ca48544 100644
--- a/src/drivers/i2c/pca9538/pca9538.c
+++ b/src/drivers/i2c/pca9538/pca9538.c
@@ -39,8 +39,8 @@ static void pca9538_init(struct device *dev)
 }
 
 static struct device_operations pca9538_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= pca9538_init,
 };
 
diff --git a/src/drivers/i2c/pcf8523/pcf8523.c b/src/drivers/i2c/pcf8523/pcf8523.c
index 82945ffe2b..03b6b2269e 100644
--- a/src/drivers/i2c/pcf8523/pcf8523.c
+++ b/src/drivers/i2c/pcf8523/pcf8523.c
@@ -118,8 +118,8 @@ static void pcf8523_init(struct device *dev)
 }
 
 static struct device_operations pcf8523c_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= pcf8523_init,
 	.final			= pcf8523_final
 };
diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c
index 7b3bb56596..851156fea0 100644
--- a/src/drivers/i2c/ptn3460/ptn3460.c
+++ b/src/drivers/i2c/ptn3460/ptn3460.c
@@ -127,8 +127,8 @@ __weak int mb_adjust_cfg(struct ptn_3460_config *cfg_ptr)
 }
 
 static struct device_operations ptn3460_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= ptn3460_init,
 };
 
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index 19ee1f2c22..68681ef846 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/src/drivers/i2c/rt1011/rt1011.c
@@ -84,8 +84,8 @@ static const char *rt1011_acpi_name(const struct device *dev)
 }
 
 static struct device_operations rt1011_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.acpi_name = rt1011_acpi_name,
 	.acpi_fill_ssdt = rt1011_fill_ssdt,
 };
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 0e4bab03cc..70c14efc45 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -75,8 +75,8 @@ static const char *rt5663_acpi_name(const struct device *dev)
 }
 
 static struct device_operations rt5663_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= rt5663_acpi_name,
 	.acpi_fill_ssdt		= rt5663_fill_ssdt,
 };
diff --git a/src/drivers/i2c/rtd2132/rtd2132.c b/src/drivers/i2c/rtd2132/rtd2132.c
index 5dffdc8000..74037ccee0 100644
--- a/src/drivers/i2c/rtd2132/rtd2132.c
+++ b/src/drivers/i2c/rtd2132/rtd2132.c
@@ -225,8 +225,8 @@ static void rtd2132_init(struct device *dev)
 }
 
 static struct device_operations rtd2132_operations = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= rtd2132_init,
 };
 
diff --git a/src/drivers/i2c/rx6110sa/rx6110sa.c b/src/drivers/i2c/rx6110sa/rx6110sa.c
index c691965f9d..028058a7e7 100644
--- a/src/drivers/i2c/rx6110sa/rx6110sa.c
+++ b/src/drivers/i2c/rx6110sa/rx6110sa.c
@@ -165,8 +165,8 @@ static void rx6110sa_init(struct device *dev)
 }
 
 static struct device_operations rx6110sa_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.init			= rx6110sa_init,
 	.final			= rx6110sa_final
 };
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index e1fe104fe8..a4fac10f60 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -79,8 +79,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= i2c_sx9310_acpi_name,
 	.acpi_fill_ssdt		= i2c_sx9310_fill_ssdt,
 };
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index eeccb7d30d..b81b0d17c8 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -62,8 +62,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= i2c_tpm_acpi_name,
 	.acpi_fill_ssdt		= i2c_tpm_fill_ssdt,
 };
diff --git a/src/drivers/i2c/w83793/w83793.c b/src/drivers/i2c/w83793/w83793.c
index c52cbb24da..822c2cee21 100644
--- a/src/drivers/i2c/w83793/w83793.c
+++ b/src/drivers/i2c/w83793/w83793.c
@@ -292,8 +292,8 @@ static void w83793_init(struct device *dev)
 }
 
 static struct device_operations w83793_operations = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = w83793_init,
 };
 
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 66e232d51a..3daf4915c6 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -30,8 +30,8 @@ static void ish_fill_ssdt_generator(struct device *dev)
 }
 
 static struct device_operations intel_ish_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_fill_ssdt		= ish_fill_ssdt_generator,
 };
 
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 41a6eb588e..aabf2bad2d 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -68,8 +68,8 @@ static const char *camera_acpi_name(const struct device *dev)
 }
 
 static struct device_operations camera_ops = {
-	.read_resources		= DEVICE_NOOP,
-	.set_resources		= DEVICE_NOOP,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= camera_acpi_name,
 	.acpi_fill_ssdt		= camera_fill_ssdt,
 };
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index ebdd4099fa..76bddbdfe5 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -190,8 +190,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.acpi_name		= spi_acpi_name,
 	.acpi_fill_ssdt		= spi_acpi_fill_ssdt_generator,
 };
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index 13f37fa4e2..a6a004f760 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -70,8 +70,8 @@ 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,
+	.read_resources		= noop_read_resources,
+	.set_resources		= noop_set_resources,
 	.scan_bus		= scan_static_bus,
 	.acpi_fill_ssdt		= usb_acpi_fill_ssdt_generator,
 };
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index a022fa7580..93d9154d83 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -122,7 +122,7 @@ static void ene932_init(struct device *dev)
 
 static struct device_operations ops = {
 	.init             = ene932_init,
-	.read_resources   = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index c34082c56b..232df8e06a 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -438,7 +438,7 @@ static void lpc_ec_read_resources(struct device *dev)
 static struct device_operations ops = {
 	.init             = lpc_ec_init,
 	.read_resources   = lpc_ec_read_resources,
-	.set_resources    = DEVICE_NOOP,
+	.set_resources    = noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_name        = google_chromeec_acpi_name,
 	.acpi_fill_ssdt   = google_chromeec_fill_ssdt_generator,
diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c
index f4bea48be4..7de4e0235e 100644
--- a/src/ec/google/wilco/chip.c
+++ b/src/ec/google/wilco/chip.c
@@ -219,7 +219,7 @@ static const char *wilco_ec_acpi_name(const struct device *dev)
 static struct device_operations ops = {
 	.init			= wilco_ec_init,
 	.read_resources		= wilco_ec_read_resources,
-	.set_resources		= DEVICE_NOOP,
+	.set_resources		= noop_set_resources,
 	.acpi_fill_ssdt		= wilco_ec_fill_ssdt_generator,
 	.acpi_name		= wilco_ec_acpi_name,
 };
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index f6acd218a7..4959db1312 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -132,7 +132,7 @@ static void ene_kb3940q_init(struct device *dev)
 
 static struct device_operations ops = {
 	.init             = ene_kb3940q_init,
-	.read_resources   = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index 19c07c50a0..9cb3755f2f 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -146,7 +146,7 @@ static void it8518_init(struct device *dev)
 
 static struct device_operations ops = {
 	.init             = it8518_init,
-	.read_resources   = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/ec/roda/it8518/ec.c b/src/ec/roda/it8518/ec.c
index 02f4c9b9db..f4a27588dc 100644
--- a/src/ec/roda/it8518/ec.c
+++ b/src/ec/roda/it8518/ec.c
@@ -35,7 +35,7 @@ static void it8518_init(struct device *dev)
 
 static struct device_operations ops = {
 	.init             = it8518_init,
-	.read_resources   = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
 };
 
 static struct pnp_info pnp_dev_info[] = {
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 9ba4d3173e..4e9c594bc0 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -66,8 +66,8 @@ struct device_operations {
 /**
  * Standard device operations function pointers shims.
  */
-static inline void device_noop(struct device *dev) {}
-#define DEVICE_NOOP device_noop
+static inline void noop_read_resources(struct device *dev) {}
+static inline void noop_set_resources(struct device *dev) {}
 
 struct bus {
 
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 7eee0f3f35..6312d8e7f7 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -273,8 +273,8 @@ static void cpu_bus_scan(struct device *bus)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = cpu_bus_init,
 	.scan_bus         = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 85b3172a2f..5826ee16de 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -823,8 +823,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = cpu_bus_init,
 	.scan_bus = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index aa0aca3b6b..57005c7817 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -892,8 +892,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index bdf4058476..e6b7db4989 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -919,8 +919,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 583379cf94..1ee951bd1a 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -894,8 +894,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index 9b0c490e77..7de5b464d5 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -902,8 +902,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index bab5cdceac..8f8c0944b6 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -1258,8 +1258,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index fc1496de9c..03230a53ae 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -80,8 +80,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index c54e3353b1..5f6c8a1c4f 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -226,8 +226,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = mp_cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 0d94dcf6de..f7c6883852 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -482,8 +482,8 @@ static const struct pci_driver mc_driver_hsw __pci_driver = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = mp_cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index f4df62bad1..da0107c962 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -79,8 +79,8 @@ static void cpu_bus_init(struct device *dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index a82cd0f941..94a5abaefa 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -198,8 +198,8 @@ static const struct pci_driver mc_driver __pci_driver = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = mp_cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index 12592fcc66..c1ee207bf1 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -253,8 +253,8 @@ static const struct pci_driver mc_driver_ard __pci_driver = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = mp_cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index 2c6944cf8a..b24356361f 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -182,8 +182,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = mp_cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ff42369b2c..ea2a737c2c 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -459,8 +459,8 @@ static const struct pci_driver mc_driver __pci_driver = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = mp_cpu_bus_init,
 };
 
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index 8b49dab356..054d2aa2ed 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -177,8 +177,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = mp_cpu_bus_init,
 };
 
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c
index 2863d22326..cef5bbaa23 100644
--- a/src/soc/amd/common/block/smbus/sm.c
+++ b/src/soc/amd/common/block/smbus/sm.c
@@ -75,8 +75,8 @@ static struct pci_operations lops_pci = {
 	.set_subsystem = pci_dev_set_subsystem,
 };
 static struct device_operations smbus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = sm_init,
 	.scan_bus = scan_smbus,
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 865dad875a..7b3e7fba59 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -19,8 +19,8 @@ extern struct device_operations picasso_i2c_mmio_ops;
 extern const char *i2c_acpi_name(const struct device *dev);
 
 struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = picasso_init_cpus,
 	.acpi_fill_ssdt   = generate_cpu_entries,
 };
diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c
index f17eccd487..22c62161f1 100644
--- a/src/soc/amd/picasso/i2c.c
+++ b/src/soc/amd/picasso/i2c.c
@@ -126,8 +126,8 @@ void i2c_soc_init(void)
 
 struct device_operations picasso_i2c_mmio_ops = {
 	/* TODO(teravest): Move I2C resource info here. */
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.scan_bus = scan_smbus,
 	.acpi_name = i2c_acpi_name,
 	.acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index b27683a6dc..189f48e8e9 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -24,8 +24,8 @@ extern struct device_operations stoneyridge_i2c_mmio_ops;
 extern const char *i2c_acpi_name(const struct device *dev);
 
 struct device_operations cpu_bus_ops = {
-	.read_resources	  = DEVICE_NOOP,
-	.set_resources	  = DEVICE_NOOP,
+	.read_resources	  = noop_read_resources,
+	.set_resources	  = noop_set_resources,
 	.init		  = stoney_init_cpus,
 	.acpi_fill_ssdt   = generate_cpu_entries,
 };
diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c
index 8ec3555c17..1fdb41691c 100644
--- a/src/soc/amd/stoneyridge/i2c.c
+++ b/src/soc/amd/stoneyridge/i2c.c
@@ -110,8 +110,8 @@ void i2c_soc_init(void)
 
 struct device_operations stoneyridge_i2c_mmio_ops = {
 	/* TODO(teravest): Move I2C resource info here. */
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.scan_bus = scan_smbus,
 	.acpi_name = i2c_acpi_name,
 	.acpi_fill_ssdt = dw_i2c_acpi_fill_ssdt,
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c
index f3adc47a42..60eb225cf1 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -381,7 +381,7 @@ static void soc_final(struct device *dev)
 
 static struct device_operations soc_ops = {
 	.read_resources   = soc_read_resources,
-	.set_resources    = DEVICE_NOOP,
+	.set_resources    = noop_set_resources,
 	.init             = soc_init,
 	.final            = soc_final,
 };
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index cf4763d67d..1075642517 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -219,8 +219,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = apollolake_init_cpus,
 	.acpi_fill_ssdt = generate_cpu_entries,
 };
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index b51d8c31de..912347c325 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -21,8 +21,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = baytrail_init_cpus,
 };
 
diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c
index 991e30f3de..cb1c37d934 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -24,8 +24,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = soc_init_cpus
 };
 
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index 4caa23653d..e81890e899 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.c
@@ -23,8 +23,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = &broadwell_init_cpus,
 };
 
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index e323346a12..df9b908813 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -184,8 +184,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.acpi_fill_ssdt   = generate_cpu_entries,
 };
 
diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c
index 050f95868e..731ce50d4a 100644
--- a/src/soc/intel/common/block/p2sb/p2sb.c
+++ b/src/soc/intel/common/block/p2sb/p2sb.c
@@ -124,7 +124,7 @@ static void read_resources(struct device *dev)
 
 static const struct device_operations device_ops = {
 	.read_resources		= read_resources,
-	.set_resources		= DEVICE_NOOP,
+	.set_resources		= noop_set_resources,
 	.ops_pci		= &pci_dev_ops_pci,
 };
 
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index dbee2977a2..fbe2b8264f 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -42,8 +42,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = denverton_init_cpus,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_fill_ssdt = generate_cpu_entries,
diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c
index 36cd0d15e5..43216e6cc1 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -140,8 +140,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.acpi_fill_ssdt   = generate_cpu_entries,
 };
 
diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c
index 643d8511d4..7b53e17bd2 100644
--- a/src/soc/intel/jasperlake/chip.c
+++ b/src/soc/intel/jasperlake/chip.c
@@ -147,8 +147,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_fill_ssdt   = generate_cpu_entries,
 #endif
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 6e471fb2d3..9df078bad8 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -95,8 +95,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_fill_ssdt   = generate_cpu_entries,
 #endif
diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c
index b93d1fc2ba..073c8d2c69 100644
--- a/src/soc/intel/tigerlake/chip.c
+++ b/src/soc/intel/tigerlake/chip.c
@@ -147,8 +147,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 #if CONFIG(HAVE_ACPI_TABLES)
 	.acpi_fill_ssdt   = generate_cpu_entries,
 #endif
diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c
index 5f1dedf497..196f3df0d1 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -31,8 +31,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = cpx_init_cpus,
 };
 
diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index fbd13d524c..be452a05b6 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -482,8 +482,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = DEVICE_NOOP,
-	.set_resources = DEVICE_NOOP,
+	.read_resources = noop_read_resources,
+	.set_resources = noop_set_resources,
 	.init = xeon_sp_init_cpus,
 #if CONFIG(HAVE_ACPI_TABLES)
 	/* defined in src/soc/intel/common/block/acpi/acpi.c */
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index 270e5e54e6..1f9f290226 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -42,8 +42,8 @@ static void soc_init(struct device *dev)
 }
 
 static struct device_operations soc_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.enable_resources = soc_enable,
 	.init             = soc_init,
 };
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index 5fc1e6a9dd..f5eb44f4f3 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -51,7 +51,7 @@ static void soc_read_resources(struct device *dev)
 
 static struct device_operations soc_ops = {
 	.read_resources   = soc_read_resources,
-	.set_resources    = DEVICE_NOOP,
+	.set_resources    = noop_set_resources,
 };
 
 static void enable_tegra210_dev(struct device *dev)
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index f7f1ec9a88..08b72ea1b5 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -24,8 +24,8 @@ static void soc_init(struct device *dev)
 }
 
 static struct device_operations soc_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.init             = soc_init,
 };
 
diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index 8b087c9107..8278b1ebfb 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -112,8 +112,8 @@ static void cpu_init(struct device *dev)
 }
 
 static struct device_operations cpu_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.enable_resources = cpu_enable,
 	.init             = cpu_init,
 };
diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index dd27730dc1..4bb03f2549 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -142,8 +142,8 @@ static void cpu_init(struct device *dev)
 }
 
 static struct device_operations cpu_ops = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
 	.enable_resources = cpu_enable,
 	.init             = cpu_init,
 };