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>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 3d849122b5b1bf345eac90465c988ff6bf1a0b68..dca11ea6d2d510151027699260ba2daecbcd136e 100644 (file)
--- 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 04c2dc70927610807b3b881258078439952a3622..944ea2170f48c84f6be53a905c245aed1aa2de69 100644 (file)
--- 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)
 {