Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] minor irq handler cleanups
  drivers/char: minor irq handler cleanups
  [PPC] minor irq handler cleanups
  [BLACKFIN] minor irq handler cleanups
  [SPARC] minor irq handler cleanups
  ARM minor irq handler cleanup: avoid passing unused info to irq

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index d272d8ce6537..2c3691fda300 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -299,7 +299,7 @@ elsa_interrupt(int intno, void *dev_id)
                 val = serial_inp(cs, UART_IIR);
                 if (!(val & UART_IIR_NO_INT)) {
                         debugl1(cs,"IIR %02x", val);
-                        rs_interrupt_elsa(intno, cs);
+                        rs_interrupt_elsa(cs);
                 }
         }
 #endif
@@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id)
                 val = serial_inp(cs, UART_IIR);
                 if (!(val & UART_IIR_NO_INT)) {
                         debugl1(cs,"IIR %02x", val);
-                        rs_interrupt_elsa(intno, cs);
+                        rs_interrupt_elsa(cs);
                 }
         }
 #endif
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
index 1642dca988a1..f181db464392 100644
--- a/drivers/isdn/hisax/elsa_ser.c
+++ b/drivers/isdn/hisax/elsa_ser.c
@@ -384,13 +384,13 @@ static inline void transmit_chars(struct IsdnCardState *cs, int *intr_done)
 }
 
 
-static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs)
+static void rs_interrupt_elsa(struct IsdnCardState *cs)
 {
         int status, iir, msr;
         int pass_counter = 0;
         
 #ifdef SERIAL_DEBUG_INTR
-        printk("rs_interrupt_single(%d)...", irq);
+        printk(KERN_DEBUG "rs_interrupt_single(%d)...", cs->irq);
 #endif
 
         do {
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 34733c903df7..e8d429fda846 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -925,7 +925,7 @@ struct IsdnCardState {
         int             (*cardmsg) (struct IsdnCardState *, int, void *);
         void            (*setstack_d) (struct PStack *, struct IsdnCardState *);
         void            (*DC_Close) (struct IsdnCardState *);
-        int             (*irq_func) (int, void *);
+        irq_handler_t   irq_func;
         int             (*auxcmd) (struct IsdnCardState *, isdn_ctrl *);
         struct Channel  channel[2+MAX_WAITING_CALLS];
         struct BCState  bcs[2+MAX_WAITING_CALLS];