From 6a9b964a2b304a24d6c89850f501e5168a822e09 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 17 May 2012 18:58:41 -0700
Subject: [PATCH] --- yaml --- r: 316451 b: refs/heads/master c:
 2d7abf32925f1a8aeeb37234c8ea7590ebbe62be h: refs/heads/master i:   316449:
 99c35fdd6223849ef88cd2b227c02042ea196d1c   316447:
 807d39784b0b43ba5a67c138d1f60b9f1fef2d5c v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/pci/hotplug/ibmphp_core.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1dac04888872..1e2ed8cf6061 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04de975e7840e6d9da3ef44ab414f3ee1b98d611
+refs/heads/master: 2d7abf32925f1a8aeeb37234c8ea7590ebbe62be
diff --git a/trunk/drivers/pci/hotplug/ibmphp_core.c b/trunk/drivers/pci/hotplug/ibmphp_core.c
index a62f296e8b0d..7dccad5fc891 100644
--- a/trunk/drivers/pci/hotplug/ibmphp_core.c
+++ b/trunk/drivers/pci/hotplug/ibmphp_core.c
@@ -775,7 +775,6 @@ static u8 bus_structure_fixup(u8 busno)
 
 static int ibm_configure_device(struct pci_func *func)
 {
-	unsigned char bus;
 	struct pci_bus *child;
 	int num;
 	int flag = 0;	/* this is to make sure we don't double scan the bus,
@@ -805,11 +804,10 @@ static int ibm_configure_device(struct pci_func *func)
 		}
 	}
 	if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
-		int max;
-		pci_read_config_byte(func->dev, PCI_SECONDARY_BUS, &bus);
-		child = pci_add_new_bus(func->dev->bus, func->dev, bus);
-		max = pci_do_scan_bus(child);
-		pci_bus_update_busn_res_end(child, max);
+		pci_hp_add_bridge(func->dev);
+		child = func->dev->subordinate;
+		if (child)
+			pci_bus_add_devices(child);
 	}
 
 	return 0;