From d500a86e96dec93560832ea8c73a2119230aac46 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 28 Oct 2011 16:26:05 -0600 Subject: [PATCH] --- yaml --- r: 283361 b: refs/heads/master c: 7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507 h: refs/heads/master i: 283359: 8d2a3a619d2fb9dde981f0d11a252aa64581aa03 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 12 ++++++++++++ trunk/drivers/pci/probe.c | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index db1921f901d3..8a1c88fc2ac8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e39ae9f9035ee02e014b5fe29461674fe19624d +refs/heads/master: 7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 3d849122b5b1..dca11ea6d2d5 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/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/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 04c2dc709276..944ea2170f48 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/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) {