diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2011-10-28 16:26:05 -0600 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 12:10:55 -0800 |
commit | 7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507 (patch) | |
tree | 48af088a8e81080f94159e7988a4c0493d456b8f | |
parent | 1e39ae9f9035ee02e014b5fe29461674fe19624d (diff) | |
download | op-kernel-dev-7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507.zip op-kernel-dev-7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507.tar.gz |
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 <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 12 | ||||
-rw-r--r-- | drivers/pci/probe.c | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 3d84912..dca11ea 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 <donald.h.fry@intel.com> + +---------------------------- + +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 <bhelgaas@google.com> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 04c2dc7..944ea21 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) { |