diff options
| author | Bjorn Helgaas | 2008-12-10 00:11:46 +0100 |
|---|---|---|
| committer | Jesse Barnes | 2009-01-07 20:12:48 +0100 |
| commit | 878f2e50fd1cfea575cdca5bf019c2175dc64131 (patch) | |
| tree | 807b5bc7312fe4f15e7317aa683dc9b1ee1db5fc /drivers/pci/pci.c | |
| parent | PCI hotplug: cpqphp: use config space PCI interrupt pin encoding (diff) | |
| download | kernel-qcow2-linux-878f2e50fd1cfea575cdca5bf019c2175dc64131.tar.gz kernel-qcow2-linux-878f2e50fd1cfea575cdca5bf019c2175dc64131.tar.xz kernel-qcow2-linux-878f2e50fd1cfea575cdca5bf019c2175dc64131.zip | |
PCI: use config space encoding in pci_get_interrupt_pin()
This patch makes pci_get_interrupt_pin() return values encoded
the same way as the "Interrupt Pin" value in PCI config space,
i.e., 1=INTA, ..., 4=INTD.
pirq_bios_set() is the only in-tree caller of pci_get_interrupt_pin()
and pci_get_interrupt_pin() is not exported.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: hpa@zytor.com
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 3222f9022707..bd52ca4c2893 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1374,9 +1374,9 @@ pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge) pin = dev->pin; if (!pin) return -1; - pin--; + while (dev->bus->self) { - pin = (pin + PCI_SLOT(dev->devfn)) % 4; + pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1; dev = dev->bus->self; } *bridge = dev; |