From: Jiang Liu Date: Tue, 28 Aug 2012 15:43:57 +0000 (+0800) Subject: PCI: Use hotplug-safe pci_get_domain_bus_and_slot() X-Git-Tag: v3.7-rc1~177^2~6^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=433efd2247b0cbf5e7e86275e1f21281d3b99047;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 Signed-off-by: Bjorn Helgaas --- diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 74bbaf8..c7d2969 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;