---

yaml --- r: 324252 b: refs/heads/master c: 433efd2 h: refs/heads/master v: v3
git-mirror · Sep 12, 2012 · 50ca248 · 50ca248
1 parent 6f63662
commit 50ca248
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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;