Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0e88af8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI: parisc: use generic pci_swizzle_interrupt_pin() 



Use the generic pci_swizzle_interrupt_pin() instead of arch-specific code.

Acked-by: default avatarKyle McMartin <kyle@infradead.org>
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 30d546da

drivers/parisc/dino.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/parisc/iosapic.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */



		/*