4 files changed, 17 insertions, 28 deletions
diff --git a/src/northbridge/via/cn400/agp.c b/src/northbridge/via/cn400/agp.c
index ce814c5f70..ece71e0e7d 100644
--- a/src/northbridge/via/cn400/agp.c
+++ b/src/northbridge/via/cn400/agp.c
@@ -128,7 +128,7 @@ static void agp_init(device_t dev)
 }
 
 static const struct device_operations agp_operations = {
-	.read_resources   = cn400_noop,
+	.read_resources   = DEVICE_NOOP,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = agp_init,
diff --git a/src/northbridge/via/cn400/cn400.h b/src/northbridge/via/cn400/cn400.h
index 2df30a6013..4921bef3c9 100644
--- a/src/northbridge/via/cn400/cn400.h
+++ b/src/northbridge/via/cn400/cn400.h
@@ -18,13 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __PRE_RAM__
-// HACK
-static inline void cn400_noop(device_t dev)
-{
-}
-#endif
-
 #define DEBUG_CN400
 
 /* VGA stuff */
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index 149eab37f9..b797179047 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -127,10 +127,10 @@ static void memctrl_init(device_t dev)
 }
 
 static const struct device_operations memctrl_operations = {
-	.read_resources = cn400_noop,
-	.set_resources    = cn400_noop,
-	.enable_resources = cn400_noop,
-	.init           = memctrl_init,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
+	.init             = memctrl_init,
 	.ops_pci          = 0,
 };
 
@@ -241,14 +241,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/cn400/vlink.c b/src/northbridge/via/cn400/vlink.c
index c98982e07c..2319e75ac9 100644
--- a/src/northbridge/via/cn400/vlink.c
+++ b/src/northbridge/via/cn400/vlink.c
@@ -158,9 +158,9 @@ static void c3_host_init(device_t dev)
 }
 
 static const struct device_operations c3_host_operations = {
-	.read_resources   = cn400_noop,
-	.set_resources    = cn400_noop,
-	.enable_resources = cn400_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
 	.init             = c3_host_init,
 	.ops_pci          = 0,
 };
@@ -195,9 +195,9 @@ static void c3_err_init(device_t dev)
 }
 
 static const struct device_operations c3_err_operations = {
-	.read_resources   = cn400_noop,
-	.set_resources    = cn400_noop,
-	.enable_resources = cn400_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
 	.init             = c3_err_init,
 	.ops_pci          = 0,
 };
@@ -231,9 +231,9 @@ static void cn400_pm_init(device_t dev)
 }
 
 static const struct device_operations cn400_pm_operations = {
-	.read_resources   = cn400_noop,
-	.set_resources    = cn400_noop,
-	.enable_resources = cn400_noop,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
 	.init             = cn400_pm_init,
 	.ops_pci          = 0,
 };