Patch set updated for coreboot: 790aa57 devicetree: Rename unused parameter to passthru

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8535

-gerrit

commit 790aa57d486f95234b4b558d2d40e4f05426a1bf
Author: Kyösti Mälkki 
Date:   Wed Feb 25 07:38:01 2015 +0200

devicetree: Rename unused parameter to passthru

The actual use of the parameter max is to keep track of PCI bus
    number while recursively scanning PCI bridges or PCI-e rootports.

Neither CPU, SMBus, LPC or other static buses are involved in this
    enumeration, but the way bridge operations were originally designed
    forced to pass this argument thru unrelated functions.

Follow-up removes these once the function prototype gets fixed.

Change-Id: Idbc9c515a362c571a1798bb36972058b309c2774
    Signed-off-by: Kyösti Mälkki 
---
 src/device/root_device.c                           | 21 +++++++++++----------
 src/mainboard/emulation/qemu-i440fx/northbridge.c  |  2 +-
 src/northbridge/amd/agesa/family10/northbridge.c   |  4 ++--
 src/northbridge/amd/agesa/family14/northbridge.c   |  4 ++--
 src/northbridge/amd/agesa/family15/northbridge.c   |  4 ++--
 src/northbridge/amd/agesa/family15rl/northbridge.c |  4 ++--
 src/northbridge/amd/agesa/family15tn/northbridge.c |  4 ++--
 src/northbridge/amd/agesa/family16kb/northbridge.c |  4 ++--
 src/northbridge/amd/amdfam10/northbridge.c         |  4 ++--
 src/northbridge/amd/amdk8/northbridge.c            |  4 ++--
 src/northbridge/amd/pi/00730F01/northbridge.c      |  4 ++--
 11 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/device/root_device.c b/src/device/root_device.c
index a5fba5c..e380d31 100644
--- a/src/device/root_device.c
+++ b/src/device/root_device.c
@@ -49,7 +49,7 @@ const char mainboard_name[] = CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_
  * @return The largest bus number used.
  */

-static unsigned int scan_static_bus(device_t bus, unsigned int max)
+static unsigned int scan_static_bus(device_t bus, unsigned int passthru)
 {
    device_t child;
    struct bus *link;
@@ -68,21 +68,21 @@ static unsigned int scan_static_bus(device_t bus, unsigned int max)
    	}
    }

-	return max;
+	return passthru;
 }

-unsigned int scan_lpc_bus(device_t bus, unsigned int max)
+unsigned int scan_lpc_bus(device_t bus, unsigned int passthru)
 {
    printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(bus));

-	max = scan_static_bus(bus, max);
+	scan_static_bus(bus, 0);

printk(BIOS_SPEW, "%s for %s done\n", __func__, dev_path(bus));

-	return max;
+	return passthru;
 }

-unsigned int scan_smbus(device_t bus, unsigned int max)
+unsigned int scan_smbus(device_t bus, unsigned int passthru)
 {
    device_t child;
    struct bus *link;
@@ -111,7 +111,7 @@ unsigned int scan_smbus(device_t bus, unsigned int max)

printk(BIOS_SPEW, "%s for %s done\n", __func__, dev_path(bus));

-	return max;
+	return passthru;
 }

/**
@@ -123,14 +123,15 @@ unsigned int scan_smbus(device_t bus, unsigned int max)
  * @param max The current bus number scanned so far, usually 0x00.
  * @return The largest bus number used.
  */
-static unsigned int root_dev_scan_bus(device_t bus, unsigned int max)
+static unsigned int root_dev_scan_bus(device_t bus, unsigned int passthru)
 {
    device_t child;
    struct bus *link;
+	unsigned int max = 0;

printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(bus));

-	max = scan_static_bus(bus, max);
+	scan_static_bus(bus, 0);

for (link = bus->link_list; link; link = link->next) {
    	for (child = link->children; child; child = child->sibling) {
@@ -143,7 +144,7 @@ static unsigned int root_dev_scan_bus(device_t bus, unsigned int max)

printk(BIOS_SPEW, "%s for %s done\n", __func__, dev_path(bus));

-	return max;
+	return passthru;
 }

static void root_dev_reset(struct bus *bus)
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 08d563f..05104dd 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -236,7 +236,7 @@ static void cpu_bus_init(device_t dev)
    initialize_cpus(dev->link_list);
 }

-static unsigned int cpu_bus_scan(device_t bus, unsigned int max)
+static unsigned int cpu_bus_scan(device_t bus, unsigned int passthru)
 {
    int max_cpus = fw_cfg_max_cpus();
    device_t cpu;
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index 8e47c1a..8fb4f8a 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -1005,7 +1005,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1181,7 +1181,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index ff669ef..7639bf6 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -765,7 +765,7 @@ static void domain_enable_resources(device_t dev)

/* Bus related code */

-static u32 cpu_bus_scan(struct device *dev, u32 max)
+static u32 cpu_bus_scan(struct device *dev, u32 passthru)
 {
    struct bus *cpu_bus = dev->link_list;
    device_t cpu;
@@ -784,7 +784,7 @@ static u32 cpu_bus_scan(struct device *dev, u32 max)
    	if (cpu)
    		amd_cpu_topology(cpu, 0, apic_id);
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 89e1644..52a03f0 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -1015,7 +1015,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1191,7 +1191,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c
index f83ff2d..2782c18 100644
--- a/src/northbridge/amd/agesa/family15rl/northbridge.c
+++ b/src/northbridge/amd/agesa/family15rl/northbridge.c
@@ -1004,7 +1004,7 @@ static void add_more_links(struct device *dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1178,7 +1178,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(struct device *dev)
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index d878b4f..c293c79 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -1002,7 +1002,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1176,7 +1176,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index badec55..3801688 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -1020,7 +1020,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1194,7 +1194,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index f28c726..f28c01d 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -1190,7 +1190,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1359,7 +1359,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 29fa2a4..a0c3d7f 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1192,7 +1192,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1331,7 +1331,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index b10da3d..f748e8f 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -1013,7 +1013,7 @@ static void add_more_links(device_t dev, unsigned total_links)
    last->next = NULL;
 }

-static u32 cpu_bus_scan(device_t dev, u32 max)
+static u32 cpu_bus_scan(device_t dev, u32 passthru)
 {
    struct bus *cpu_bus;
    device_t dev_mc;
@@ -1199,7 +1199,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
    			amd_cpu_topology(cpu, i, j);
    	} //j
    }
-	return max;
+	return passthru;
 }

static void cpu_bus_init(device_t dev)