lkml.org 
[lkml]   [2016]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V4 14/23] x86, ia64: Include acpi_pci_{add|remove}_bus to the default pcibios_{add|remove}_bus implementation.
    Date
    x86 and ia64 are the only arches that implement pcibios_{add|remove}_bus hooks
    and implement them in the same way. Moreover ARM64 is going to do the same.
    So it seems that acpi_pci_{add|remove}_bus is generic enough to be default
    option for pcibios_{add|remove}_bus hooks. Also, it is always safe to run
    acpi_pci_{add|remove}_bus as they have empty stubs for !ACPI case and
    return if ACPI has been switched off in run time.

    After all we can remove x86 and ia64 pcibios_{add|remove}_bus
    implementation.

    Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
    Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Tested-by: Duc Dang <dhdang@apm.com>
    Tested-by: Dongdong Liu <liudongdong3@huawei.com>
    Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
    Tested-by: Graeme Gregory <graeme.gregory@linaro.org>
    Tested-by: Sinan Kaya <okaya@codeaurora.org>
    ---
    arch/ia64/pci/pci.c | 10 ----------
    arch/x86/pci/common.c | 10 ----------
    drivers/pci/probe.c | 3 +++
    3 files changed, 3 insertions(+), 20 deletions(-)

    diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
    index 978d6af..be4c9ef 100644
    --- a/arch/ia64/pci/pci.c
    +++ b/arch/ia64/pci/pci.c
    @@ -358,16 +358,6 @@ void pcibios_fixup_bus(struct pci_bus *b)
    platform_pci_fixup_bus(b);
    }

    -void pcibios_add_bus(struct pci_bus *bus)
    -{
    - acpi_pci_add_bus(bus);
    -}
    -
    -void pcibios_remove_bus(struct pci_bus *bus)
    -{
    - acpi_pci_remove_bus(bus);
    -}
    -
    void pcibios_set_master (struct pci_dev *dev)
    {
    /* No special bus mastering setup handling */
    diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
    index 2879efc..5aa25f1 100644
    --- a/arch/x86/pci/common.c
    +++ b/arch/x86/pci/common.c
    @@ -171,16 +171,6 @@ void pcibios_fixup_bus(struct pci_bus *b)
    pcibios_fixup_device_resources(dev);
    }

    -void pcibios_add_bus(struct pci_bus *bus)
    -{
    - acpi_pci_add_bus(bus);
    -}
    -
    -void pcibios_remove_bus(struct pci_bus *bus)
    -{
    - acpi_pci_remove_bus(bus);
    -}
    -
    /*
    * Only use DMI information to set this if nothing was passed
    * on the kernel command line (which was parsed earlier).
    diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
    index 81dd3a2..ef22a22 100644
    --- a/drivers/pci/probe.c
    +++ b/drivers/pci/probe.c
    @@ -12,6 +12,7 @@
    #include <linux/slab.h>
    #include <linux/module.h>
    #include <linux/cpumask.h>
    +#include <linux/pci-acpi.h>
    #include <linux/pci-aspm.h>
    #include <linux/aer.h>
    #include <linux/acpi.h>
    @@ -2060,10 +2061,12 @@ int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)

    void __weak pcibios_add_bus(struct pci_bus *bus)
    {
    + acpi_pci_add_bus(bus);
    }

    void __weak pcibios_remove_bus(struct pci_bus *bus)
    {
    + acpi_pci_remove_bus(bus);
    }

    struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-02-04 19:21    [W:2.774 / U:0.840 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site