1 files changed, 11 insertions, 6 deletions

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 058a525c2ab6..f9430f5ca9a8 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -43,11 +43,16 @@
 
 static int __init dns323_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        /* PCI-E */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
+        int irq;
 
-        pr_err("%s: requested mapping for unknown bus\n", __func__);
+        /*
+         * Check for devices with hard-wired IRQs.
+         */
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
+
+        pr_err("%s: requested mapping for unknown device\n", __func__);
 
         return -1;
 }
@@ -250,9 +255,9 @@ static void __init dns323_init(void)
          */
         orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE);
 
-        /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIE
+        /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe
          *
-         * Open a special address decode windows for the PCIE WA.
+         * Open a special address decode windows for the PCIe WA.
          */
         orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
                                 ORION5X_PCIE_WA_SIZE);