From 807d39784b0b43ba5a67c138d1f60b9f1fef2d5c 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: 316447 b: refs/heads/master c:
 c6da81a4d3cb8d461f77c5f61843fcc9c18b6c2c h: refs/heads/master i:   316445:
 e3f79bbd0568317586946c9f526a890c3455a373   316443:
 968b52744e72b76a4b0b55d2ec5f080ddf0d1db2   316439:
 ba899fb5d543d665d59e5b9cf995bd8805416470   316431:
 613b039ea25685435717fbacbc7d887cc219a490   316415:
 e774075e3cc436cdbe2b549f4457baadb5d4d829 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/pci/hotplug/pciehp_pci.c | 28 ++------------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index fa44c68053cd..485246f3da1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8e4b9c101ae58cc64cda0201229d3318701a7f0
+refs/heads/master: c6da81a4d3cb8d461f77c5f61843fcc9c18b6c2c
diff --git a/trunk/drivers/pci/hotplug/pciehp_pci.c b/trunk/drivers/pci/hotplug/pciehp_pci.c
index b898f06b588d..09cecaf450c5 100644
--- a/trunk/drivers/pci/hotplug/pciehp_pci.c
+++ b/trunk/drivers/pci/hotplug/pciehp_pci.c
@@ -34,29 +34,6 @@
 #include "../pci.h"
 #include "pciehp.h"
 
-static int __ref pciehp_add_bridge(struct pci_dev *dev)
-{
-	struct pci_bus *parent = dev->bus;
-	int pass, busnr, start = parent->busn_res.start;
-	int end = parent->busn_res.end;
-
-	for (busnr = start; busnr <= end; busnr++) {
-		if (!pci_find_bus(pci_domain_nr(parent), busnr))
-			break;
-	}
-	if (busnr-- > end) {
-		err("No bus number available for hot-added bridge %s\n",
-				pci_name(dev));
-		return -1;
-	}
-	for (pass = 0; pass < 2; pass++)
-		busnr = pci_scan_bridge(parent, dev, busnr, pass);
-	if (!dev->subordinate)
-		return -1;
-
-	return 0;
-}
-
 int pciehp_configure_device(struct slot *p_slot)
 {
 	struct pci_dev *dev;
@@ -85,9 +62,8 @@ int pciehp_configure_device(struct slot *p_slot)
 		if (!dev)
 			continue;
 		if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
-				(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
-			pciehp_add_bridge(dev);
-		}
+				(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
+			pci_hp_add_bridge(dev);
 		pci_dev_put(dev);
 	}