From e3453ba50121feeccce65efb7a2e10722309ba97 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 16 Dec 2011 15:31:39 -0700
Subject: [PATCH] --- yaml --- r: 288191 b: refs/heads/master c:
 f79eaeb108499e10fa604103737e7273404e76a4 h: refs/heads/master i:   288189:
 62d5ed44a4719a33c456402794b513f96610149f   288187:
 eed1c7368c1bb9ceba1cc9f5061308573b96c6e6   288183:
 4519cc745da8a1c30ca0788cc8199dd8439f8b97   288175:
 2797a2b0fc0c283f851b3490a14bef4e946ebed2   288159:
 599e6756529b120eb0693a0d1a8de2253965abea   288127:
 7fc19607b6c2fa2e1615449ff9645aaa75b2e4b5 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/mips/pci/pci.c                    |  5 +----
 trunk/arch/mips/pmc-sierra/yosemite/ht-irq.c | 10 ----------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 3d200c8429dd..e9c0c0a622b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43ca4957a15a120d0822a60a22998dbb41bbf075
+refs/heads/master: f79eaeb108499e10fa604103737e7273404e76a4
diff --git a/trunk/arch/mips/pci/pci.c b/trunk/arch/mips/pci/pci.c
index aec2b111d35b..15521505ebe8 100644
--- a/trunk/arch/mips/pci/pci.c
+++ b/trunk/arch/mips/pci/pci.c
@@ -279,7 +279,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 {
 	/* Propagate hose info into the subordinate devices.  */
 
-	struct list_head *ln;
 	struct pci_dev *dev = bus->self;
 
 	if (pci_probe_only && dev &&
@@ -288,9 +287,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 		pcibios_fixup_device_resources(dev, bus);
 	}
 
-	for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
-		dev = pci_dev_b(ln);
-
+	list_for_each_entry(dev, &bus->devices, bus_list) {
 		if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
 			pcibios_fixup_device_resources(dev, bus);
 	}
diff --git a/trunk/arch/mips/pmc-sierra/yosemite/ht-irq.c b/trunk/arch/mips/pmc-sierra/yosemite/ht-irq.c
index 86b98e98fb4f..62ead6601c69 100644
--- a/trunk/arch/mips/pmc-sierra/yosemite/ht-irq.c
+++ b/trunk/arch/mips/pmc-sierra/yosemite/ht-irq.c
@@ -35,16 +35,6 @@
  */
 void __init titan_ht_pcibios_fixup_bus(struct pci_bus *bus)
 {
-	struct pci_bus *current_bus = bus;
-	struct pci_dev *devices;
-	struct list_head *devices_link;
-
-	list_for_each(devices_link, &(current_bus->devices)) {
-		devices = pci_dev_b(devices_link);
-		if (devices == NULL)
-			continue;
-	}
-
 	/*
 	 * PLX and SPKT related changes go here
 	 */