PCI/keystone: Prepare irq handlers for irq argument removal
authorThomas Gleixner <tglx@linutronix.de>
Thu, 16 Jul 2015 21:24:10 +0000 (23:24 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 16 Jul 2015 21:31:37 +0000 (23:31 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/pci/host/pci-keystone.c

index 5998e93a03b10d2503dcb4e1b6bd425a9f48f45d..81253e70b1c5441b41544a58f682caa73f84dbc8 100644 (file)
@@ -110,8 +110,9 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)
        return -EINVAL;
 }
 
-static void ks_pcie_msi_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ks_pcie_msi_irq_handler(unsigned int __irq, struct irq_desc *desc)
 {
+       unsigned int irq = irq_desc_get_irq(desc);
        struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);
        u32 offset = irq - ks_pcie->msi_host_irqs[0];
        struct pcie_port *pp = &ks_pcie->pp;
@@ -137,8 +138,10 @@ static void ks_pcie_msi_irq_handler(unsigned int irq, struct irq_desc *desc)
  * Traverse through pending legacy interrupts and invoke handler for each. Also
  * takes care of interrupt controller level mask/ack operation.
  */
-static void ks_pcie_legacy_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ks_pcie_legacy_irq_handler(unsigned int __irq,
+                                      struct irq_desc *desc)
 {
+       unsigned int irq = irq_desc_get_irq(desc);
        struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);
        struct pcie_port *pp = &ks_pcie->pp;
        u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0];