Merge git://git.infradead.org/~dhowells/irq-2.6

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type

1 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 1f97e3d92639..5b83e7b59621 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -64,8 +64,10 @@
 #define SA_TRIGGER_RISING       IRQF_TRIGGER_RISING
 #define SA_TRIGGER_MASK         IRQF_TRIGGER_MASK
 
+typedef irqreturn_t (*irq_handler_t)(int, void *);
+
 struct irqaction {
-        irqreturn_t (*handler)(int, void *, struct pt_regs *);
+        irq_handler_t handler;
         unsigned long flags;
         cpumask_t mask;
         const char *name;
@@ -75,9 +77,8 @@ struct irqaction {
         struct proc_dir_entry *dir;
 };
 
-extern irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs);
-extern int request_irq(unsigned int,
-                       irqreturn_t (*handler)(int, void *, struct pt_regs *),
+extern irqreturn_t no_action(int cpl, void *dev_id);
+extern int request_irq(unsigned int, irq_handler_t handler,
                        unsigned long, const char *, void *);
 extern void free_irq(unsigned int, void *);