From: Bjorn Helgaas Date: Fri, 28 Oct 2011 22:26:05 +0000 (-0600) Subject: PCI: deprecate pci_scan_bus_parented() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507;p=linux-beck.git PCI: deprecate pci_scan_bus_parented() Users of pci_scan_bus_parented() should be converted to use either pci_scan_root_bus() (preferred, but also calls pci_bus_add_devices) or pci_create_root_bus() pci_scan_child_bus() Since pci_scan_bus_parented(), I'm marking it deprecated now and will actually remove it later. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes --- diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 3d849122b5b1..dca11ea6d2d5 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -551,3 +551,15 @@ When: 3.5 Why: The iwlagn module has been renamed iwlwifi. The alias will be around for backward compatibility for several cycles and then dropped. Who: Don Fry + +---------------------------- + +What: pci_scan_bus_parented() +When: 3.5 +Why: The pci_scan_bus_parented() interface creates a new root bus. The + bus is created with default resources (ioport_resource and + iomem_resource) that are always wrong, so we rely on arch code to + correct them later. Callers of pci_scan_bus_parented() should + convert to using pci_scan_root_bus() so they can supply a list of + bus resources when the bus is created. +Who: Bjorn Helgaas diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 04c2dc709276..944ea2170f48 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1637,6 +1637,7 @@ struct pci_bus *pci_create_bus(struct device *parent, return b; } +/* Deprecated; use pci_scan_root_bus() instead */ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata) {