Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / irqchip / irq-ti-sci-intr.c

diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
index ac9d6d6..fe8fad2 100644 (file)
--- a/drivers/irqchip/irq-ti-sci-intr.c
+++ b/drivers/irqchip/irq-ti-sci-intr.c
@@ -129,7 +129,7 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
  * @virq:      Corresponding Linux virtual IRQ number
  * @hwirq:     Corresponding hwirq for the IRQ within this IRQ domain
  *
- * Returns parent irq if all went well else appropriate error pointer.
+ * Returns intr output irq if all went well else appropriate error pointer.
  */
 static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
                                        unsigned int virq, u32 hwirq)
@@ -173,7 +173,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
        if (err)
                goto err_msg;
 
-       return p_hwirq;
+       return out_irq;
 
 err_msg:
        irq_domain_free_irqs_parent(domain, virq, 1);
@@ -198,19 +198,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
        struct irq_fwspec *fwspec = data;
        unsigned long hwirq;
        unsigned int flags;
-       int err, p_hwirq;
+       int err, out_irq;
 
        err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
        if (err)
                return err;
 
-       p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
-       if (p_hwirq < 0)
-               return p_hwirq;
+       out_irq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
+       if (out_irq < 0)
+               return out_irq;
 
        irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
                                      &ti_sci_intr_irq_chip,
-                                     (void *)(uintptr_t)p_hwirq);
+                                     (void *)(uintptr_t)out_irq);
 
        return 0;
 }