Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 17 deletions

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 517561fc7317..90cb55f6d7eb 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -175,28 +175,13 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
         struct irqaction *action = desc->action;
         irqreturn_t ret;
 
-        irq_compat_clr_pending(desc);
         desc->istate &= ~IRQS_PENDING;
-        irq_compat_set_progress(desc);
-        desc->istate |= IRQS_INPROGRESS;
+        irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
         raw_spin_unlock(&desc->lock);
 
         ret = handle_irq_event_percpu(desc, action);
 
         raw_spin_lock(&desc->lock);
-        desc->istate &= ~IRQS_INPROGRESS;
-        irq_compat_clr_progress(desc);
+        irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);
         return ret;
 }
-
-/**
- * handle_IRQ_event - irq action chain handler
- * @irq:        the interrupt number
- * @action:     the interrupt action chain for this irq
- *
- * Handles the action chain of an irq event
- */
-irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
-{
-        return handle_irq_event_percpu(irq_to_desc(irq), action);
-}