2 files changed, 4 insertions, 15 deletions
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 214ca8bc4b..fad0c2f926 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -61,7 +61,7 @@ static void memctrl_init(device_t dev)
 }
 
 static const struct device_operations memctrl_operations = {
-	.read_resources = vx800_noop,
+	.read_resources = DEVICE_NOOP,
 	.init = memctrl_init,
 };
 
@@ -150,14 +150,10 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-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 = cpu_bus_init,
 	.scan_bus = 0,
 };
diff --git a/src/northbridge/via/vx800/vx800.h b/src/northbridge/via/vx800/vx800.h
index adfe27209a..ae944efcb1 100644
--- a/src/northbridge/via/vx800/vx800.h
+++ b/src/northbridge/via/vx800/vx800.h
@@ -20,13 +20,6 @@
 #ifndef VX800_H
 #define VX800_H 1
 
-#ifndef __PRE_RAM__
-#include <device/device.h>
-static inline void vx800_noop(device_t dev)
-{
-}
-#endif
-
 #ifdef __PRE_RAM__
 /* vx800_early_smbus.c */
 struct mem_controller;