Lets get rid of empty PCI init stub, related ACPI header and
go with full-blown PCI host bridge driver.

Signed-off-by: Tomasz Nowicki <t...@semihalf.com>
CC: Arnd Bergmann <a...@arndb.de>
CC: Catalin Marinas <catalin.mari...@arm.com>
CC: Liviu Dudau <liviu.du...@arm.com>
CC: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
CC: Will Deacon <will.dea...@arm.com>
Tested-by: Duc Dang <dhd...@apm.com>
Tested-by: Dongdong Liu <liudongdo...@huawei.com>
Tested-by: Hanjun Guo <hanjun....@linaro.org>
Tested-by: Graeme Gregory <graeme.greg...@linaro.org>
Tested-by: Sinan Kaya <ok...@codeaurora.org>
---
 arch/arm64/Kconfig      | 1 +
 arch/arm64/kernel/pci.c | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 4f45ea4..567523b 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -2,6 +2,7 @@ config ARM64
        def_bool y
        select ACPI_CCA_REQUIRED if ACPI
        select ACPI_GENERIC_GSI if ACPI
+       select ACPI_PCI_HOST_GENERIC if ACPI
        select ACPI_REDUCED_HARDWARE_ONLY if ACPI
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index d1a701f..0b53262 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -70,12 +70,3 @@ int pcibios_add_device(struct pci_dev *dev)
 
        return 0;
 }
-
-#ifdef CONFIG_ACPI
-/* Root bridge scanning */
-struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
-{
-       /* TODO: Should be revisited when implementing PCI on ACPI */
-       return NULL;
-}
-#endif
-- 
1.9.1

Reply via email to