diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:01 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:01 -0500 |
commit | 8f5b3f5b40d1d4e33570ea74a2023695c37c06b2 (patch) | |
tree | de9bf180e2015c87115a44a5592ebbaca3dc0699 /drivers/pci/dwc/pci-keystone.c | |
parent | 352948c414d92784a2edb762554d1c682ebd4661 (diff) | |
parent | da4c4be36dc347b9b7eb0760054caa53e31abcc0 (diff) |
Merge branch 'pci/host-keystone' into next
* pci/host-keystone:
PCI: keystone: Use PCI_NUM_INTX
PCI: keystone: Remove duplicate MAX_*_IRQS defs
PCI: keystone-dw: Remove unused ks_pcie, pci variables
Diffstat (limited to 'drivers/pci/dwc/pci-keystone.c')
-rw-r--r-- | drivers/pci/dwc/pci-keystone.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pci/dwc/pci-keystone.c b/drivers/pci/dwc/pci-keystone.c index 3ad3f8aa27b0..5bee3af47588 100644 --- a/drivers/pci/dwc/pci-keystone.c +++ b/drivers/pci/dwc/pci-keystone.c @@ -32,10 +32,6 @@ #define DRIVER_NAME "keystone-pcie" -/* driver specific constants */ -#define MAX_MSI_HOST_IRQS 8 -#define MAX_LEGACY_HOST_IRQS 4 - /* DEV_STAT_CTRL */ #define PCIE_CAP_BASE 0x70 @@ -173,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; |