PCI: keystone: Use PCI_NUM_INTX

Switch from using custom MAX_LEGACY_IRQS and MAX_LEGACY_HOST_IRQS macros to
the generic PCI_NUM_INTX definition for the number of INTx interrupts.

Based-on-similar-patches-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>

diff --git a/drivers/pci/dwc/pci-keystone-dw.c b/drivers/pci/dwc/pci-keystone-dw.c
index df60f48716d97761ea33370f274188e666475b25..3b0f206590f926a98b7e36d6e59336b37d8330c0 100644 (file)
--- a/drivers/pci/dwc/pci-keystone-dw.c
+++ b/drivers/pci/dwc/pci-keystone-dw.c
@@ -251,7 +251,7 @@ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie)
 {
        int i;
 
-       for (i = 0; i < MAX_LEGACY_IRQS; i++)
+       for (i = 0; i < PCI_NUM_INTX; i++)
                ks_dw_app_writel(ks_pcie, IRQ_ENABLE_SET + (i << 4), 0x1);
 }
 
@@ -557,7 +557,7 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
        /* Create legacy IRQ domain */
        ks_pcie->legacy_irq_domain =
                        irq_domain_add_linear(ks_pcie->legacy_intc_np,
-                                       MAX_LEGACY_IRQS,
+                                       PCI_NUM_INTX,
                                        &ks_dw_pcie_legacy_irq_domain_ops,
                                        NULL);
        if (!ks_pcie->legacy_irq_domain) {

diff --git a/drivers/pci/dwc/pci-keystone.c b/drivers/pci/dwc/pci-keystone.c
index fb8504690923b45cab914771e298246d9a108628..9256b04e0c50d2c0c48ba32ec3b8e86b26475ea0 100644 (file)
--- a/drivers/pci/dwc/pci-keystone.c
+++ b/drivers/pci/dwc/pci-keystone.c
@@ -169,7 +169,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
 
        if (legacy) {
                np_temp = &ks_pcie->legacy_intc_np;
-               max_host_irqs = MAX_LEGACY_HOST_IRQS;
+               max_host_irqs = PCI_NUM_INTX;
                host_irqs = &ks_pcie->legacy_host_irqs[0];
        } else {
                np_temp = &ks_pcie->msi_intc_np;

diff --git a/drivers/pci/dwc/pci-keystone.h b/drivers/pci/dwc/pci-keystone.h
index 74c5825882df9fa45d38e148b728cbaad89b8ee5..30b7bc2ac3800c869159f55e57b3d1fa51cd91e0 100644 (file)
--- a/drivers/pci/dwc/pci-keystone.h
+++ b/drivers/pci/dwc/pci-keystone.h
@@ -12,9 +12,7 @@
  * published by the Free Software Foundation.
  */
 
-#define MAX_LEGACY_IRQS                        4
 #define MAX_MSI_HOST_IRQS              8
-#define MAX_LEGACY_HOST_IRQS           4
 
 struct keystone_pcie {
        struct dw_pcie          *pci;
@@ -22,7 +20,7 @@ struct keystone_pcie {
        /* PCI Device ID */
        u32                     device_id;
        int                     num_legacy_host_irqs;
-       int                     legacy_host_irqs[MAX_LEGACY_HOST_IRQS];
+       int                     legacy_host_irqs[PCI_NUM_INTX];
        struct                  device_node *legacy_intc_np;
 
        int                     num_msi_host_irqs;