[Arm-dev] [PATCH v1 83/87] arm64, acpi, pci: Omit OF related IRQ parsing when running with ACPI kernel.

[Vadim Lomovtsev]

From: Tomasz Nowicki <tn at semihalf.com>

Signed-off-by: Tomasz Nowicki <tn at semihalf.com>
Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev at caviumnetworks.com>
---
 arch/arm64/kernel/pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 7642075..9b6e789 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -53,7 +53,8 @@ int pcibios_add_device(struct pci_dev *dev)
 	if (pcibios_add_device_impl)
 		return pcibios_add_device_impl(dev);
 
-	dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
+	if (acpi_disabled)
+		dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
 
 	return 0;
 }
-- 
2.4.3