iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen/pcifront: Don't use deprecated function pci_scan_bus_parented()

Browse Source 
Use pci_scan_root_bus() instead of deprecated function
pci_scan_bus_parented().

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: xen-devel@lists.xenproject.org
This commit is contained in:
Arnd Bergmann 2015-04-28 17:32:33 +08:00 committed by Bjorn Helgaas
parent 528d4bce10
commit 515d425bd2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/xen-pcifront.c
View File

@ -446,9 +446,15 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
unsigned int domain, unsigned int bus) unsigned int domain, unsigned int bus)
{ {
struct pci_bus *b; struct pci_bus *b;
LIST_HEAD(resources);
struct pcifront_sd *sd = NULL; struct pcifront_sd *sd = NULL;
struct pci_bus_entry *bus_entry = NULL; struct pci_bus_entry *bus_entry = NULL;
int err = 0; int err = 0;
static struct resource busn_res = {
.start = 0,
.end = 255,
.flags = IORESOURCE_BUS,
};
#ifndef CONFIG_PCI_DOMAINS #ifndef CONFIG_PCI_DOMAINS
if (domain != 0) { if (domain != 0) {
@ -470,17 +476,21 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
err = -ENOMEM; err = -ENOMEM;
goto err_out; goto err_out;
} }
pci_add_resource(&resources, &ioport_resource);
pci_add_resource(&resources, &iomem_resource);
pci_add_resource(&resources, &busn_res);
pcifront_init_sd(sd, domain, bus, pdev); pcifront_init_sd(sd, domain, bus, pdev);
pci_lock_rescan_remove(); pci_lock_rescan_remove();
b = pci_scan_bus_parented(&pdev->xdev->dev, bus, b = pci_scan_root_bus(&pdev->xdev->dev, bus,
&pcifront_bus_ops, sd); &pcifront_bus_ops, sd, &resources);
if (!b) { if (!b) {
dev_err(&pdev->xdev->dev, dev_err(&pdev->xdev->dev,
"Error creating PCI Frontend Bus!\n"); "Error creating PCI Frontend Bus!\n");
err = -ENOMEM; err = -ENOMEM;
pci_unlock_rescan_remove(); pci_unlock_rescan_remove();
pci_free_resource_list(&resources);
goto err_out; goto err_out;
} }
@ -488,7 +498,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
list_add(&bus_entry->list, &pdev->root_buses); list_add(&bus_entry->list, &pdev->root_buses);
/* pci_scan_bus_parented skips devices which do not have a have /* pci_scan_root_bus skips devices which do not have a
* devfn==0. The pcifront_scan_bus enumerates all devfn. */ * devfn==0. The pcifront_scan_bus enumerates all devfn. */
err = pcifront_scan_bus(pdev, domain, bus, b); err = pcifront_scan_bus(pdev, domain, bus, b);