From 50ca2482187df6de2dd6a741b9a3b14e340e0088 Mon Sep 17 00:00:00 2001
From: Jiang Liu <liuj97@gmail.com>
Date: Tue, 28 Aug 2012 23:43:57 +0800
Subject: [PATCH] --- yaml --- r: 324252 b: refs/heads/master c:
 433efd2247b0cbf5e7e86275e1f21281d3b99047 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/iov.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1e63b8d0dfaa..b666bf384d90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9d18b37e408b10854e15a918849194a4e089001
+refs/heads/master: 433efd2247b0cbf5e7e86275e1f21281d3b99047
diff --git a/trunk/drivers/pci/iov.c b/trunk/drivers/pci/iov.c
index 74bbaf82638d..c7d2969699be 100644
--- a/trunk/drivers/pci/iov.c
+++ b/trunk/drivers/pci/iov.c
@@ -152,15 +152,11 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)
 static void virtfn_remove(struct pci_dev *dev, int id, int reset)
 {
 	char buf[VIRTFN_ID_LEN];
-	struct pci_bus *bus;
 	struct pci_dev *virtfn;
 	struct pci_sriov *iov = dev->sriov;
 
-	bus = pci_find_bus(pci_domain_nr(dev->bus), virtfn_bus(dev, id));
-	if (!bus)
-		return;
-
-	virtfn = pci_get_slot(bus, virtfn_devfn(dev, id));
+	virtfn = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus),
+			virtfn_bus(dev, id), virtfn_devfn(dev, id));
 	if (!virtfn)
 		return;