Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ"

This reverts commit 41550c5128150175197257b6ceab2cd50dea7b51.

Quoth Ben Herrenschmidt:
 "Please revert this one for now.  It seems to break G5s :( Looks like
  PCI cells inside Apple IO ASICs don't have a PCI_INTERRUPT_LINE set.
  I need to figure out a better fix."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 17fcb4842fe5a9edc8465ddb01785a8e78896f07..603dff3ad62adaa18ff6a24ac63c0ee7cfb30e7d 100644 (file)
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -914,17 +914,6 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
        u8 pin;
        int rc;
 
-       /* We need to first check if the PCI device has a PCI interrupt at all
-        * since we have cases where the device-node might expose non-PCI
-        * interrupts, but the device has no PCI interrupt to it
-        */
-       rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
-       if (rc != 0)
-               return rc;
-       /* No pin, exit */
-       if (pin == 0)
-               return -ENODEV;
-
        /* Check if we have a device node, if yes, fallback to standard OF
         * parsing
         */
@@ -936,6 +925,12 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
         * interrupt spec.  we assume #interrupt-cells is 1, which is standard
         * for PCI. If you do different, then don't use that routine.
         */
+       rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
+       if (rc != 0)
+               return rc;
+       /* No pin, exit */
+       if (pin == 0)
+               return -ENODEV;
 
        /* Now we walk up the PCI tree */
        lspec = pin;