lkml.org 
[lkml]   [2013]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/3] PCI: mark pci_scan_bus_parented() as __deprecated
    Date
    From: Jiang Liu <jiang.liu@huawei.com>

    Mark pci_scan_bus_parented() as __deprecated and clean up outdated
    comments.

    Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
    Cc: Chris Metcalf <cmetcalf@tilera.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Thierry Reding <thierry.reding@avionic-design.de>
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-pci@vger.kernel.org
    ---
    arch/tile/kernel/pci.c | 3 ---
    drivers/pci/probe.c | 19 -------------------
    include/linux/pci.h | 2 --
    3 files changed, 24 deletions(-)

    diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
    index 67237d3..936e087 100644
    --- a/arch/tile/kernel/pci.c
    +++ b/arch/tile/kernel/pci.c
    @@ -309,9 +309,6 @@ int __init pcibios_init(void)
    *
    * It reads the PCI tree for this bus into the Linux
    * data structures.
    - *
    - * This is inlined in linux/pci.h and calls into
    - * pci_scan_bus_parented() in probe.c.
    */
    pci_add_resource(&resources, &ioport_resource);
    pci_add_resource(&resources, &iomem_resource);
    diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
    index ed768d8..af30772 100644
    --- a/drivers/pci/probe.c
    +++ b/drivers/pci/probe.c
    @@ -1901,25 +1901,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
    }
    EXPORT_SYMBOL(pci_scan_root_bus);

    -/* Deprecated; use pci_scan_root_bus() instead */
    -struct pci_bus *pci_scan_bus_parented(struct device *parent,
    - int bus, struct pci_ops *ops, void *sysdata)
    -{
    - LIST_HEAD(resources);
    - struct pci_bus *b;
    -
    - pci_add_resource(&resources, &ioport_resource);
    - pci_add_resource(&resources, &iomem_resource);
    - pci_add_resource(&resources, &busn_resource);
    - b = pci_create_root_bus(parent, bus, ops, sysdata, &resources);
    - if (b)
    - pci_scan_child_bus(b);
    - else
    - pci_free_resource_list(&resources);
    - return b;
    -}
    -EXPORT_SYMBOL(pci_scan_bus_parented);
    -
    struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
    void *sysdata)
    {
    diff --git a/include/linux/pci.h b/include/linux/pci.h
    index f1229c7..41ec0a5 100644
    --- a/include/linux/pci.h
    +++ b/include/linux/pci.h
    @@ -720,8 +720,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
    void pcibios_scan_specific_bus(int busn);
    struct pci_bus *pci_find_bus(int domain, int busnr);
    void pci_bus_add_devices(const struct pci_bus *bus);
    -struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
    - struct pci_ops *ops, void *sysdata);
    struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
    struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
    struct pci_ops *ops, void *sysdata,
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-06-21 18:41    [W:4.243 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site