1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/pci/dwc/pci-keystone-dw.c b/drivers/pci/dwc/pci-keystone-dw.c
index 8bc626e640c8..2fb20b887d2a 100644
--- a/drivers/pci/dwc/pci-keystone-dw.c
+++ b/drivers/pci/dwc/pci-keystone-dw.c
@@ -1,5 +1,5 @@
 /*
- * Designware application register space functions for Keystone PCI controller
+ * DesignWare application register space functions for Keystone PCI controller
  *
  * Copyright (C) 2013-2014 Texas Instruments., Ltd.
  *              http://www.ti.com
@@ -168,16 +168,12 @@ void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq)
 
 static void ks_dw_pcie_msi_irq_mask(struct irq_data *d)
 {
-        struct keystone_pcie *ks_pcie;
         struct msi_desc *msi;
         struct pcie_port *pp;
-        struct dw_pcie *pci;
         u32 offset;
 
         msi = irq_data_get_msi_desc(d);
         pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);
-        pci = to_dw_pcie_from_pp(pp);
-        ks_pcie = to_keystone_pcie(pci);
         offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);
 
         /* Mask the end point if PVM implemented */
@@ -191,16 +187,12 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d)
 
 static void ks_dw_pcie_msi_irq_unmask(struct irq_data *d)
 {
-        struct keystone_pcie *ks_pcie;
         struct msi_desc *msi;
         struct pcie_port *pp;
-        struct dw_pcie *pci;
         u32 offset;
 
         msi = irq_data_get_msi_desc(d);
         pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);
-        pci = to_dw_pcie_from_pp(pp);
-        ks_pcie = to_keystone_pcie(pci);
         offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);
 
         /* Mask the end point if PVM implemented */
@@ -259,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);
 }
 
@@ -565,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) {