diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:23:52 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:23:52 -0500 |
| commit | 741e2237be94405f03db1ff627a39ef0c086d50d (patch) | |
| tree | 7d6d3067dc75110d715f48efe043e952c6e1b855 /drivers/pci | |
| parent | 37deba4525956a7106727446ceec3536acd0d1f3 (diff) | |
| parent | 0d2977a354a7839806280e49b4e3d9ac4e49e2c4 (diff) | |
Merge branch 'pci/host-aardvark' into next
* pci/host-aardvark:
PCI: aardvark: Use PCI_NUM_INTX
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-aardvark.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 5fb9b620ac78..89f4e3d072d7 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -191,7 +191,6 @@ #define LINK_WAIT_USLEEP_MIN 90000 #define LINK_WAIT_USLEEP_MAX 100000 -#define LEGACY_IRQ_NUM 4 #define MSI_IRQ_NUM 32 struct advk_pcie { @@ -729,7 +728,7 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) irq_chip->irq_unmask = advk_pcie_irq_unmask; pcie->irq_domain = - irq_domain_add_linear(pcie_intc_node, LEGACY_IRQ_NUM, + irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, &advk_pcie_irq_domain_ops, pcie); if (!pcie->irq_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); @@ -786,7 +785,7 @@ static void advk_pcie_handle_int(struct advk_pcie *pcie) advk_pcie_handle_msi(pcie); /* Process legacy interrupts */ - for (i = 0; i < LEGACY_IRQ_NUM; i++) { + for (i = 0; i < PCI_NUM_INTX; i++) { if (!(status & PCIE_ISR0_INTX_ASSERT(i))) continue; |