genirq: revert dynarray

Revert the dynarray changes. They need more thought and polishing.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 5 insertions, 25 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index e6f73dbfcc3d..d96d6f687c48 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -326,11 +326,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
         if (unlikely(desc->status & IRQ_INPROGRESS))
                 goto out_unlock;
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-#ifdef CONFIG_HAVE_DYN_ARRAY
-        kstat_irqs_this_cpu(desc)++;
-#else
-        kstat_irqs_this_cpu(irq)++;
-#endif
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         action = desc->action;
         if (unlikely(!action || (desc->status & IRQ_DISABLED)))
@@ -371,11 +367,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
         if (unlikely(desc->status & IRQ_INPROGRESS))
                 goto out_unlock;
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-#ifdef CONFIG_HAVE_DYN_ARRAY
-        kstat_irqs_this_cpu(desc)++;
-#else
-        kstat_irqs_this_cpu(irq)++;
-#endif
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         /*
          * If its disabled or no action available
@@ -422,11 +414,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
                 goto out;
 
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-#ifdef CONFIG_HAVE_DYN_ARRAY
-        kstat_irqs_this_cpu(desc)++;
-#else
-        kstat_irqs_this_cpu(irq)++;
-#endif
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         /*
          * If its disabled or no action available
@@ -490,11 +478,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
                 mask_ack_irq(desc, irq);
                 goto out_unlock;
         }
-#ifdef CONFIG_HAVE_DYN_ARRAY
-        kstat_irqs_this_cpu(desc)++;
-#else
-        kstat_irqs_this_cpu(irq)++;
-#endif
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         /* Start handling the irq */
         desc->chip->ack(irq);
@@ -549,11 +533,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
         irqreturn_t action_ret;
 
-#ifdef CONFIG_HAVE_DYN_ARRAY
-        kstat_irqs_this_cpu(desc)++;
-#else
-        kstat_irqs_this_cpu(irq)++;
-#endif
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         if (desc->chip->ack)
                 desc->chip->ack(irq);