summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2012-08-28 23:43:57 +0800
committerBjorn Helgaas <bhelgaas@google.com>2012-09-12 14:14:30 -0600
commit433efd2247b0cbf5e7e86275e1f21281d3b99047 (patch)
treeb3c2f3fba564b48bb088afed6e722815ceb599c4 /drivers/pci
parenta9d18b37e408b10854e15a918849194a4e089001 (diff)
downloadlinux-433efd2247b0cbf5e7e86275e1f21281d3b99047.tar.gz
linux-433efd2247b0cbf5e7e86275e1f21281d3b99047.tar.bz2
linux-433efd2247b0cbf5e7e86275e1f21281d3b99047.zip
PCI: Use hotplug-safe pci_get_domain_bus_and_slot()
Following code has a race window between pci_find_bus() and pci_get_slot() if PCI hotplug operation happens between them which removes the pci_bus. So use PCI hotplug safe interface pci_get_domain_bus_and_slot() instead, which also reduces code complexity. struct pci_bus *pci_bus = pci_find_bus(domain, busno); struct pci_dev *pci_dev = pci_get_slot(pci_bus, devfn); Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/iov.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 74bbaf82638d..c7d2969699be 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -152,15 +152,11 @@ failed1:
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;