| Message ID | 20090217204910.4213.77580.stgit@bob.kio (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tuesday 17 February 2009 1:49:10 pm Bjorn Helgaas wrote: > Use the generic pci_swizzle_interrupt_pin() instead of ACPI-specific code. Did you have a reaction to this? If you did, I missed it. > Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> > --- > drivers/acpi/pci_irq.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c > index 891bdf6..be6b909 100644 > --- a/drivers/acpi/pci_irq.c > +++ b/drivers/acpi/pci_irq.c > @@ -319,7 +319,7 @@ static struct acpi_prt_entry > *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) */ > bridge = dev->bus->self; > while (bridge) { > - pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1; > + pin = pci_swizzle_interrupt_pin(dev, pin); > > if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) { > /* PC card has the same IRQ as its cardbridge */ -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
applied -- Len Brown, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 891bdf6..be6b909 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -319,7 +319,7 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) */ bridge = dev->bus->self; while (bridge) { - pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1; + pin = pci_swizzle_interrupt_pin(dev, pin); if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) { /* PC card has the same IRQ as its cardbridge */
Use the generic pci_swizzle_interrupt_pin() instead of ACPI-specific code. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> --- drivers/acpi/pci_irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html