Commit 741e2237 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-aardvark' into next 

* pci/host-aardvark:
  PCI: aardvark: Use PCI_NUM_INTX
parents 37deba45 0d2977a3

drivers/pci/host/pci-aardvark.c

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