6 files changed, 15 insertions, 33 deletions
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index ce9eb4941a..7a5b9c22f5 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -40,12 +40,10 @@ static struct device_operations pci_domain_ops = {
 	.ops_pci_bus      = pci_bus_default_ops,
 };
 
-static void cpu_bus_noop(device_t dev) { }
-
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = cpu_bus_noop,
-	.set_resources    = cpu_bus_noop,
-	.enable_resources = cpu_bus_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
 	.init             = baytrail_init_cpus,
 	.scan_bus         = NULL,
 };
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index 94f7893ede..2a12820c5c 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.c
@@ -36,12 +36,10 @@ static struct device_operations pci_domain_ops = {
 	.ops_pci_bus      = &pci_ops_mmconf,
 };
 
-static void cpu_bus_noop(device_t dev) { }
-
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = &cpu_bus_noop,
-	.set_resources    = &cpu_bus_noop,
-	.enable_resources = &cpu_bus_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
 	.init             = &broadwell_init_cpus,
 };
 
diff --git a/src/soc/intel/fsp_baytrail/chip.c b/src/soc/intel/fsp_baytrail/chip.c
index 839e8dc1a4..732d1dcd1e 100644
--- a/src/soc/intel/fsp_baytrail/chip.c
+++ b/src/soc/intel/fsp_baytrail/chip.c
@@ -50,12 +50,10 @@ static struct device_operations pci_domain_ops = {
 	.ops_pci_bus      = pci_bus_default_ops,
 };
 
-static void cpu_bus_noop(device_t dev) { }
-
 static struct device_operations cpu_bus_ops = {
-	.read_resources   = cpu_bus_noop,
-	.set_resources    = cpu_bus_noop,
-	.enable_resources = cpu_bus_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
 	.init             = baytrail_init_cpus,
 	.scan_bus         = NULL,
 };
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index 11a52c4737..8ad1aa9730 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -45,13 +45,9 @@ static void soc_init(device_t dev)
 	printk(BIOS_INFO, "CPU: Tegra124\n");
 }
 
-static void soc_noop(device_t dev)
-{
-}
-
 static struct device_operations soc_ops = {
-	.read_resources   = soc_noop,
-	.set_resources    = soc_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
 	.enable_resources = soc_enable,
 	.init             = soc_init,
 	.scan_bus         = 0,
diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index b8b88d74a2..60fa55a3de 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -129,13 +129,9 @@ static void cpu_init(device_t dev)
 			cpu_id, get_arm_clk() / (1024*1024));
 }
 
-static void cpu_noop(device_t dev)
-{
-}
-
 static struct device_operations cpu_ops = {
-	.read_resources   = cpu_noop,
-	.set_resources    = cpu_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
 	.enable_resources = cpu_enable,
 	.init             = cpu_init,
 	.scan_bus         = 0,
diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index 506b6768c6..c90463660d 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -160,13 +160,9 @@ static void cpu_init(device_t dev)
 			cpu_id, get_arm_clk() / 1000000);
 }
 
-static void cpu_noop(device_t dev)
-{
-}
-
 static struct device_operations cpu_ops = {
-	.read_resources   = cpu_noop,
-	.set_resources    = cpu_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
 	.enable_resources = cpu_enable,
 	.init             = cpu_init,
 	.scan_bus         = 0,