lkml.org 
[lkml]   [2012]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -v3 06/47] PCI: Move back pci_rescan_bus()
    Date
    Now we have pci_assign_unassigned_bus_resources() in place.

    So move back pci_rescan_bus to probe.c where it should be.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    drivers/pci/probe.c | 21 +++++++++++++++++++++
    drivers/pci/setup-bus.c | 22 ----------------------
    2 files changed, 21 insertions(+), 22 deletions(-)

    diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
    index 38e0448..3dc92b9 100644
    --- a/drivers/pci/probe.c
    +++ b/drivers/pci/probe.c
    @@ -2036,6 +2036,27 @@ unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge)
    return max;
    }

    +/**
    + * pci_rescan_bus - scan a PCI bus for devices.
    + * @bus: PCI bus to scan
    + *
    + * Scan a PCI bus and child buses for new devices, adds them,
    + * and enables them.
    + *
    + * Returns the max number of subordinate bus discovered.
    + */
    +unsigned int __ref pci_rescan_bus(struct pci_bus *bus)
    +{
    + unsigned int max;
    +
    + max = pci_scan_child_bus(bus);
    + pci_assign_unassigned_bus_resources(bus);
    + pci_bus_add_devices(bus);
    +
    + return max;
    +}
    +EXPORT_SYMBOL_GPL(pci_rescan_bus);
    +
    EXPORT_SYMBOL(pci_add_new_bus);
    EXPORT_SYMBOL(pci_scan_slot);
    EXPORT_SYMBOL(pci_scan_bridge);
    diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    index 6443c81..f35a679 100644
    --- a/drivers/pci/setup-bus.c
    +++ b/drivers/pci/setup-bus.c
    @@ -1507,25 +1507,3 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)

    pci_enable_bridges(bus);
    }
    -#ifdef CONFIG_HOTPLUG
    -/**
    - * pci_rescan_bus - scan a PCI bus for devices.
    - * @bus: PCI bus to scan
    - *
    - * Scan a PCI bus and child buses for new devices, adds them,
    - * and enables them.
    - *
    - * Returns the max number of subordinate bus discovered.
    - */
    -unsigned int __ref pci_rescan_bus(struct pci_bus *bus)
    -{
    - unsigned int max;
    -
    - max = pci_scan_child_bus(bus);
    - pci_assign_unassigned_bus_resources(bus);
    - pci_bus_add_devices(bus);
    -
    - return max;
    -}
    -EXPORT_SYMBOL_GPL(pci_rescan_bus);
    -#endif
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-03-19 07:07    [W:0.026 / U:89.768 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site