[coreboot-gerrit] Patch set updated for coreboot: 673345d devicetree: Rename unused parameter max in domain_scan_bus()

[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/8855

-gerrit

commit 673345dd48977f79497913f0933950d679a2e73a
Author: Kyösti Mälkki 
Date:   Thu Mar 19 15:26:52 2015 +0200

devicetree: Rename unused parameter max in domain_scan_bus()

For the PCI root node, input parameter max==0 and output value
    max is not relevant for operation.

Change-Id: I23adab24aa957c4d51d703098a9a40ed660b4e6c
    Signed-off-by: Kyösti Mälkki 
---
 src/device/pci_device.c                          | 7 ++++---
 src/northbridge/amd/agesa/family10/northbridge.c | 4 ++--
 src/northbridge/amd/agesa/family15/northbridge.c | 4 ++--
 src/northbridge/amd/amdfam10/northbridge.c       | 4 ++--
 src/northbridge/amd/amdk8/northbridge.c          | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 4651258..e43d4e5 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -1271,10 +1271,11 @@ unsigned int pci_scan_bridge(struct device *dev, unsigned int max)
  * @param max The highest bus number assigned up to now.
  * @return The maximum bus number found, after scanning all subordinate busses.
  */
-unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
+unsigned int pci_domain_scan_bus(device_t dev, unsigned int unused)
 {
-	max = pci_scan_bus(dev->link_list, PCI_DEVFN(0, 0), 0xff, max);
-	return max;
+	struct bus *link = dev->link_list;
+	link->subordinate = pci_scan_bus(link, PCI_DEVFN(0, 0), 0xff, link->secondary);
+	return unused;
 }

/**
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index c9e4200..bb2f1d8 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -905,7 +905,7 @@ static void amdfam10_domain_set_resources(device_t dev)
    }
 }

-static u32 amdfam10_domain_scan_bus(device_t dev, u32 max)
+static u32 amdfam10_domain_scan_bus(device_t dev, u32 unused)
 {
    u32 reg;
    int i;
@@ -942,7 +942,7 @@ static u32 amdfam10_domain_scan_bus(device_t dev, u32 max)
    		pci_write_config32(f0_dev, HT_TRANSACTION_CONTROL, httc);
    	}
    }
-	return max;
+	return unused;
 }

diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 5a08f23..093d0c0 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -951,11 +951,11 @@ static void domain_set_resources(device_t dev)
 }

/* all family15's pci devices are under 0x18.0, so we search from dev 0x18 fun 0 */
-static unsigned int f15_pci_domain_scan_bus(device_t dev, unsigned int max)
+static unsigned int f15_pci_domain_scan_bus(device_t dev, unsigned int unused)
 {
    struct bus *link = dev->link_list;
    link->subordinate = pci_scan_bus(link, PCI_DEVFN(0x18, 0), 0xff, link->secondary);
-	return link->subordinate;
+	return unused;
 }

static struct device_operations pci_domain_ops = {
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 68b0a80..3e2d0f5 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -912,7 +912,7 @@ static void amdfam10_domain_set_resources(device_t dev)
    }
 }

-static u32 amdfam10_domain_scan_bus(device_t dev, u32 max)
+static u32 amdfam10_domain_scan_bus(device_t dev, u32 unused)
 {
    u32 reg;
    int i;
@@ -949,7 +949,7 @@ static u32 amdfam10_domain_scan_bus(device_t dev, u32 max)
    		pci_write_config32(f0_dev, HT_TRANSACTION_CONTROL, httc);
    	}
    }
-	return max;
+	return unused;
 }

#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 18f7459..f4177ba 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1095,7 +1095,7 @@ static void amdk8_domain_set_resources(device_t dev)

}

-static u32 amdk8_domain_scan_bus(device_t dev, u32 max)
+static u32 amdk8_domain_scan_bus(device_t dev, u32 unused)
 {
    u32 reg;
    int i;
@@ -1131,7 +1131,7 @@ static u32 amdk8_domain_scan_bus(device_t dev, u32 max)
    		pci_write_config32(f0_dev, HT_TRANSACTION_CONTROL, httc);
    	}
    }
-	return max;
+	return unused;
 }

static struct device_operations pci_domain_ops = {