From d8c0bc0402c20175fed5e96bf76410e4781185b9 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Tue, 28 Aug 2012 23:43:58 +0800 Subject: [PATCH] --- yaml --- r: 324253 b: refs/heads/master c: 2ccc246d9c6eaa6596818ff917721a444acd0b61 h: refs/heads/master i: 324251: 6f63662d1604b16d7607f02b9955e6bf5626aa63 v: v3 --- [refs] | 2 +- trunk/drivers/pci/xen-pcifront.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b666bf384d90..4108fee83730 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 433efd2247b0cbf5e7e86275e1f21281d3b99047 +refs/heads/master: 2ccc246d9c6eaa6596818ff917721a444acd0b61 diff --git a/trunk/drivers/pci/xen-pcifront.c b/trunk/drivers/pci/xen-pcifront.c index d6cc62cb4cf7..def8d0b5620c 100644 --- a/trunk/drivers/pci/xen-pcifront.c +++ b/trunk/drivers/pci/xen-pcifront.c @@ -982,7 +982,6 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) int err = 0; int i, num_devs; unsigned int domain, bus, slot, func; - struct pci_bus *pci_bus; struct pci_dev *pci_dev; char str[64]; @@ -1032,13 +1031,8 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) goto out; } - pci_bus = pci_find_bus(domain, bus); - if (!pci_bus) { - dev_dbg(&pdev->xdev->dev, "Cannot get bus %04x:%02x\n", - domain, bus); - continue; - } - pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func)); + pci_dev = pci_get_domain_bus_and_slot(domain, bus, + PCI_DEVFN(slot, func)); if (!pci_dev) { dev_dbg(&pdev->xdev->dev, "Cannot get PCI device %04x:%02x:%02x.%d\n",