4 files changed, 9 insertions, 37 deletions
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 57502e915b..8384c988b6 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -779,15 +779,7 @@ static void domain_enable_resources(device_t dev)
 
 /* Bus related code */
 
-static void cpu_bus_read_resources(device_t dev)
-{
-}
-
-static void cpu_bus_set_resources(device_t dev)
-{
-}
-
-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(struct device *dev, u32 max)
 {
 	struct bus *cpu_bus = dev->link_list;
 	device_t cpu;
@@ -846,8 +838,8 @@ static struct device_operations pci_domain_ops = {
 };
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources = cpu_bus_read_resources,
-	.set_resources = cpu_bus_set_resources,
+	.read_resources = DEVICE_NOOP,
+	.set_resources = DEVICE_NOOP,
 	.enable_resources = NULL,
 	.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 ce9785e625..aab061eaf8 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -1092,17 +1092,9 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_read_resources(device_t dev)
-{
-}
-
-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,
+	.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/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index d77897dee6..2632321093 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -1054,17 +1054,9 @@ static void cpu_bus_init(device_t dev)
 	initialize_cpus(dev->link_list);
 }
 
-static void cpu_bus_read_resources(device_t dev)
-{
-}
-
-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,
+	.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/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 76ffc5d00d..70d925b4f1 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -1411,11 +1411,7 @@ static void cpu_bus_init(device_t dev)
 #endif
 }
 
-static void cpu_bus_read_resources(device_t dev)
-{
-}
-
-static void cpu_bus_set_resources(device_t dev)
+static void cpu_bus_set_resources(struct device *dev)
 {
 	struct resource *resource = find_resource(dev, 0xc0010058);
 	if (resource) {
@@ -1425,7 +1421,7 @@ static void cpu_bus_set_resources(device_t dev)
 }
 
 static struct device_operations cpu_bus_ops = {
-	.read_resources	  = cpu_bus_read_resources,
+	.read_resources	  = DEVICE_NOOP,
 	.set_resources	  = cpu_bus_set_resources,
 	.enable_resources = DEVICE_NOOP,
 	.init		  = cpu_bus_init,