1 files changed, 18 insertions, 30 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 4cf65f5c6a74..11c99697acfe 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -249,7 +249,6 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
  *      handle_simple_irq - Simple and software-decoded IRQs.
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Simple interrupts are either sent from a demultiplexing interrupt
  *      handler or come from hardware, where no interrupt hardware control
@@ -259,7 +258,7 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
  *      unmask issues if necessary.
  */
 void fastcall
-handle_simple_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_simple_irq(unsigned int irq, struct irq_desc *desc)
 {
         struct irqaction *action;
         irqreturn_t action_ret;
@@ -279,9 +278,9 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         desc->status |= IRQ_INPROGRESS;
         spin_unlock(&desc->lock);
 
-        action_ret = handle_IRQ_event(irq, regs, action);
+        action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
@@ -293,7 +292,6 @@ out_unlock:
  *      handle_level_irq - Level type irq handler
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Level type interrupts are active as long as the hardware line has
  *      the active level. This may require to mask the interrupt and unmask
@@ -301,7 +299,7 @@ out_unlock:
  *      interrupt line is back to inactive.
  */
 void fastcall
-handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_level_irq(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int cpu = smp_processor_id();
         struct irqaction *action;
@@ -329,9 +327,9 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         desc->status &= ~IRQ_PENDING;
         spin_unlock(&desc->lock);
 
-        action_ret = handle_IRQ_event(irq, regs, action);
+        action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
@@ -345,7 +343,6 @@ out_unlock:
  *      handle_fasteoi_irq - irq handler for transparent controllers
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Only a single callback will be issued to the chip: an ->eoi()
  *      call when the interrupt has been serviced. This enables support
@@ -353,8 +350,7 @@ out_unlock:
  *      details in hardware, transparently.
  */
 void fastcall
-handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc,
-                   struct pt_regs *regs)
+handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int cpu = smp_processor_id();
         struct irqaction *action;
@@ -382,9 +378,9 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc,
         desc->status &= ~IRQ_PENDING;
         spin_unlock(&desc->lock);
 
-        action_ret = handle_IRQ_event(irq, regs, action);
+        action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
@@ -398,7 +394,6 @@ out:
  *      handle_edge_irq - edge type IRQ handler
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Interrupt occures on the falling and/or rising edge of a hardware
  *      signal. The occurence is latched into the irq controller hardware
@@ -412,7 +407,7 @@ out:
  *      loop is left.
  */
 void fastcall
-handle_edge_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 {
         const unsigned int cpu = smp_processor_id();
 
@@ -463,9 +458,9 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 
                 desc->status &= ~IRQ_PENDING;
                 spin_unlock(&desc->lock);
-                action_ret = handle_IRQ_event(irq, regs, action);
+                action_ret = handle_IRQ_event(irq, action);
                 if (!noirqdebug)
-                        note_interrupt(irq, desc, action_ret, regs);
+                        note_interrupt(irq, desc, action_ret);
                 spin_lock(&desc->lock);
 
         } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
@@ -480,12 +475,11 @@ out_unlock:
  *      handle_percpu_IRQ - Per CPU local irq handler
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Per CPU interrupts on SMP machines without locking requirements
  */
 void fastcall
-handle_percpu_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
         irqreturn_t action_ret;
 
@@ -494,9 +488,9 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         if (desc->chip->ack)
                 desc->chip->ack(irq);
 
-        action_ret = handle_IRQ_event(irq, regs, desc->action);
+        action_ret = handle_IRQ_event(irq, desc->action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         if (desc->chip->eoi)
                 desc->chip->eoi(irq);
@@ -505,10 +499,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 #endif /* CONFIG_SMP */
 
 void
-__set_irq_handler(unsigned int irq,
-                  void fastcall (*handle)(unsigned int, irq_desc_t *,
-                                          struct pt_regs *),
-                  int is_chained)
+__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained)
 {
         struct irq_desc *desc;
         unsigned long flags;
@@ -561,9 +552,7 @@ __set_irq_handler(unsigned int irq,
 
 void
 set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
-                         void fastcall (*handle)(unsigned int,
-                                                 struct irq_desc *,
-                                                 struct pt_regs *))
+                         irq_flow_handler_t handle)
 {
         set_irq_chip(irq, chip);
         __set_irq_handler(irq, handle, 0);
@@ -574,8 +563,7 @@ set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
  * /proc/interrupts output:
  */
 const char *
-handle_irq_name(void fastcall (*handle)(unsigned int, struct irq_desc *,
-                                        struct pt_regs *))
+handle_irq_name(irq_flow_handler_t handle)
 {
         if (handle == handle_level_irq)
                 return "level  ";