diff --git a/src/northbridge/amd/agesa/00730F01/northbridge.c b/src/northbridge/amd/agesa/00730F01/northbridge.c
index 2689569c95..03433af5d8 100644
--- a/src/northbridge/amd/agesa/00730F01/northbridge.c
+++ b/src/northbridge/amd/agesa/00730F01/northbridge.c
@@ -1081,10 +1081,6 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_noop(device_t dev)
-{
-}
-
 static void cpu_bus_read_resources(device_t dev)
 {
 #if CONFIG_MMCONF_SUPPORT
@@ -1108,7 +1104,7 @@ static void cpu_bus_set_resources(device_t dev)
 static struct device_operations cpu_bus_ops = {
 	.read_resources	  = cpu_bus_read_resources,
 	.set_resources	  = cpu_bus_set_resources,
-	.enable_resources = cpu_bus_noop,
+	.enable_resources = DEVICE_NOOP,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index d3d64791c5..b1f0890390 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -1376,10 +1376,6 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_noop(device_t dev)
-{
-}
-
 static void cpu_bus_read_resources(device_t dev)
 {
 #if CONFIG_MMCONF_SUPPORT
@@ -1403,7 +1399,7 @@ static void cpu_bus_set_resources(device_t dev)
 static struct device_operations cpu_bus_ops = {
 	.read_resources	  = cpu_bus_read_resources,
 	.set_resources	  = cpu_bus_set_resources,
-	.enable_resources = cpu_bus_noop,
+	.enable_resources = DEVICE_NOOP,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 34d7ea3765..ce9785e625 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -1092,10 +1092,6 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_noop(device_t dev)
-{
-}
-
 static void cpu_bus_read_resources(device_t dev)
 {
 }
@@ -1107,7 +1103,7 @@ static void cpu_bus_set_resources(device_t dev)
 static struct device_operations cpu_bus_ops = {
 	.read_resources	  = cpu_bus_read_resources,
 	.set_resources	  = cpu_bus_set_resources,
-	.enable_resources = cpu_bus_noop,
+	.enable_resources = DEVICE_NOOP,
 	.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 3e2c6350a2..d77897dee6 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -1054,10 +1054,6 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_noop(device_t dev)
-{
-}
-
 static void cpu_bus_read_resources(device_t dev)
 {
 }
@@ -1069,7 +1065,7 @@ static void cpu_bus_set_resources(device_t dev)
 static struct device_operations cpu_bus_ops = {
 	.read_resources	  = cpu_bus_read_resources,
 	.set_resources	  = cpu_bus_set_resources,
-	.enable_resources = cpu_bus_noop,
+	.enable_resources = DEVICE_NOOP,
 	.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 5572282799..d47a00d23d 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -1060,10 +1060,6 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_noop(device_t dev)
-{
-}
-
 static void cpu_bus_read_resources(device_t dev)
 {
 #if CONFIG_MMCONF_SUPPORT
@@ -1087,7 +1083,7 @@ static void cpu_bus_set_resources(device_t dev)
 static struct device_operations cpu_bus_ops = {
 	.read_resources	  = cpu_bus_read_resources,
 	.set_resources	  = cpu_bus_set_resources,
-	.enable_resources = cpu_bus_noop,
+	.enable_resources = DEVICE_NOOP,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 529dc0afd1..76ffc5d00d 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -1411,10 +1411,6 @@ static void cpu_bus_init(device_t dev)
 #endif
 }
 
-static void cpu_bus_noop(device_t dev)
-{
-}
-
 static void cpu_bus_read_resources(device_t dev)
 {
 }
@@ -1431,7 +1427,7 @@ static void cpu_bus_set_resources(device_t dev)
 static struct device_operations cpu_bus_ops = {
 	.read_resources	  = cpu_bus_read_resources,
 	.set_resources	  = cpu_bus_set_resources,
-	.enable_resources = cpu_bus_noop,
+	.enable_resources = DEVICE_NOOP,
 	.init		  = cpu_bus_init,
 	.scan_bus	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 7d12dbd1a5..a91a4994b0 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1350,14 +1350,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	  = cpu_bus_scan,
 };
diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c
index c8f7f94ece..bcb6e56198 100644
--- a/src/northbridge/amd/gx1/northbridge.c
+++ b/src/northbridge/amd/gx1/northbridge.c
@@ -132,14 +132,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/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index e2f4d11d82..a48226d808 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -325,14 +325,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/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c
index df69b514cb..4e840250e8 100644
--- a/src/northbridge/amd/lx/northbridge.c
+++ b/src/northbridge/amd/lx/northbridge.c
@@ -429,14 +429,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,
 };