From 4aecfae53dd2974295edbbd017ed5be0e5ee79f3 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Fri, 20 Jul 2007 13:35:34 -0500
Subject: [PATCH] --- yaml --- r: 62861 b: refs/heads/master c:
 f64fddbeac737bfc8d966423f067a9af9eeec887 h: refs/heads/master i:   62859:
 ae3ee59def63e7c67811a27c122c1d17abd89b25 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/powerpc/kernel/pci_32.c     | 18 ++++++++++++------
 trunk/include/asm-powerpc/pci-bridge.h |  2 ++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f2810f23538a..928525d94bfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f16dab981aa9d423bdfe096e3422acd33d905c1e
+refs/heads/master: f64fddbeac737bfc8d966423f067a9af9eeec887
diff --git a/trunk/arch/powerpc/kernel/pci_32.c b/trunk/arch/powerpc/kernel/pci_32.c
index bfcfa14e831f..721a69400d65 100644
--- a/trunk/arch/powerpc/kernel/pci_32.c
+++ b/trunk/arch/powerpc/kernel/pci_32.c
@@ -415,15 +415,13 @@ probe_resource(struct pci_bus *parent, struct resource *pr,
 	return 0;
 }
 
-static void __init
-update_bridge_base(struct pci_bus *bus, int i)
+void __init
+update_bridge_resource(struct pci_dev *dev, struct resource *res)
 {
-	struct resource *res = bus->resource[i];
 	u8 io_base_lo, io_limit_lo;
 	u16 mem_base, mem_limit;
 	u16 cmd;
 	unsigned long start, end, off;
-	struct pci_dev *dev = bus->self;
 	struct pci_controller *hose = dev->sysdata;
 
 	if (!hose) {
@@ -467,12 +465,20 @@ update_bridge_base(struct pci_bus *bus, int i)
 		pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT, mem_limit);
 
 	} else {
-		DBG(KERN_ERR "PCI: ugh, bridge %s res %d has flags=%lx\n",
-		    pci_name(dev), i, res->flags);
+		DBG(KERN_ERR "PCI: ugh, bridge %s res has flags=%lx\n",
+		    pci_name(dev), res->flags);
 	}
 	pci_write_config_word(dev, PCI_COMMAND, cmd);
 }
 
+static void __init
+update_bridge_base(struct pci_bus *bus, int i)
+{
+	struct resource *res = bus->resource[i];
+	struct pci_dev *dev = bus->self;
+	update_bridge_resource(dev, res);
+}
+
 static inline void alloc_resource(struct pci_dev *dev, int idx)
 {
 	struct resource *pr, *r = &dev->resource[idx];
diff --git a/trunk/include/asm-powerpc/pci-bridge.h b/trunk/include/asm-powerpc/pci-bridge.h
index 9ce8f2991acf..d53e0eb1de16 100644
--- a/trunk/include/asm-powerpc/pci-bridge.h
+++ b/trunk/include/asm-powerpc/pci-bridge.h
@@ -92,6 +92,8 @@ extern int early_find_capability(struct pci_controller *hose, int bus,
 extern void setup_indirect_pci(struct pci_controller* hose,
 			       u32 cfg_addr, u32 cfg_data, u32 flags);
 extern void setup_grackle(struct pci_controller *hose);
+extern void __init update_bridge_resource(struct pci_dev *dev,
+					  struct resource *res);
 
 #else