genirq: Consolidate disable/enable

Create irq_disable/enable and use them to keep the flags consistent.

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

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 988fe7a24282514d28819f424061e0219ec5106e..86c8e42f7fe416718f26ee1e0270df6713fa37b4 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -200,7 +200,7 @@ int irq_startup(struct irq_desc *desc)
        if (desc->irq_data.chip->irq_startup)
                return desc->irq_data.chip->irq_startup(&desc->irq_data);
 
-       desc->irq_data.chip->irq_enable(&desc->irq_data);
+       irq_enable(desc);
        return 0;
 }
 
@@ -211,6 +211,16 @@ void irq_shutdown(struct irq_desc *desc)
        desc->irq_data.chip->irq_shutdown(&desc->irq_data);
 }
 
+void irq_enable(struct irq_desc *desc)
+{
+       desc->irq_data.chip->irq_enable(&desc->irq_data);
+}
+
+void irq_disable(struct irq_desc *desc)
+{
+       desc->irq_data.chip->irq_disable(&desc->irq_data);
+}
+
 /*
  * default enable function
  */

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 5cbfc93ed7b1a7eb1fbb238a711e83b441975df9..c71fc4de037166c4da35dcd2dd07c6c9cccd3923 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -40,6 +40,8 @@ extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume);
 
 extern int irq_startup(struct irq_desc *desc);
 extern void irq_shutdown(struct irq_desc *desc);
+extern void irq_enable(struct irq_desc *desc);
+extern void irq_disable(struct irq_desc *desc);
 
 extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
 

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 9c562477e28b5a3790abbe9ecf8edce74fae0be7..00780239969743167e08e8f42b5379d09d5bdabe 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -331,7 +331,7 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
 
        if (!desc->depth++) {
                desc->status |= IRQ_DISABLED;
-               desc->irq_data.chip->irq_disable(&desc->irq_data);
+               irq_disable(desc);
        }
 }
 

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index dc49358b73fa4cdaa746e25d669389dd873ac2f2..4bfe268dffe5fe4050b0210aa7fb6af1f5b81556 100644 (file)
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -55,20 +55,20 @@ static DECLARE_TASKLET(resend_tasklet, resend_irqs, 0);
  */
 void check_irq_resend(struct irq_desc *desc, unsigned int irq)
 {
-       unsigned int status = desc->status;
-
        /*
         * Make sure the interrupt is enabled, before resending it:
         */
-       desc->irq_data.chip->irq_enable(&desc->irq_data);
+       irq_enable(desc);
 
        /*
         * We do not resend level type interrupts. Level type
         * interrupts are resent by hardware when they are still
         * active.
         */
-       if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
-               desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
+       if (desc->status & IRQ_LEVEL)
+               return;
+       if ((desc->status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+               desc->status = (desc->status & ~IRQ_PENDING) | IRQ_REPLAY;
 
                if (!desc->irq_data.chip->irq_retrigger ||
                    !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index f749d29bfd81d3f460d90cb9f1f181024d148d39..c300b8f6008d7f05d3e840ce6e56970cf6e1dc92 100644 (file)
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -303,7 +303,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
                printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
                desc->status |= IRQ_DISABLED | IRQ_SPURIOUS_DISABLED;
                desc->depth++;
-               desc->irq_data.chip->irq_disable(&desc->irq_data);
+               irq_disable(desc);
 
                mod_timer(&poll_spurious_irq_timer,
                          jiffies + POLL_SPURIOUS_IRQ_INTERVAL);