2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index c5a44ff1f32f..d539d9df88e7 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -547,7 +547,7 @@ dino_card_fixup(struct pci_dev *dev)
         ** The additional "-1" adjusts for skewing the IRQ<->slot.
         */
         dino_cfg_read(dev->bus, dev->devfn, PCI_INTERRUPT_PIN, 1, &irq_pin); 
-        dev->irq = (irq_pin + PCI_SLOT(dev->devfn) - 1) % 4 ;
+        dev->irq = pci_swizzle_interrupt_pin(dev, irq_pin) - 1;
 
         /* Shouldn't really need to do this but it's in case someone tries
         ** to bypass PCI services and look at the card themselves.
@@ -672,7 +672,7 @@ dino_fixup_bus(struct pci_bus *bus)
                         
                         dino_cfg_read(dev->bus, dev->devfn, 
                                       PCI_INTERRUPT_PIN, 1, &irq_pin);
-                        irq_pin = (irq_pin + PCI_SLOT(dev->devfn) - 1) % 4 ;
+                        irq_pin = pci_swizzle_interrupt_pin(dev, irq_pin) - 1;
                         printk(KERN_WARNING "Device %s has undefined IRQ, "
                                         "setting to %d\n", pci_name(dev), irq_pin);
                         dino_cfg_write(dev->bus, dev->devfn, 
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 9dedbbd218c3..0797659ee016 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -519,8 +519,7 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
                 **
                 ** Advantage is it's really easy to implement.
                 */
-                intr_pin = ((intr_pin-1)+PCI_SLOT(pcidev->devfn)) % 4;
-                intr_pin++;     /* convert back to INTA-D (1-4) */
+                intr_pin = pci_swizzle_interrupt_pin(pcidev, intr_pin);
 #endif /* PCI_BRIDGE_FUNCS */
 
                 /*