Commit 896c6fa1 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik

[ISDN] minor irq handler cleanups

- reference irq number in CardState structure

- remove now-unused 'intno' argument from rs_interrupt_elsa()

- cs->irq_func() should be defined using standard irq_handler_t

- add KERN_DEBUG to printk() where appropriate
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a6f97b29
...@@ -299,7 +299,7 @@ elsa_interrupt(int intno, void *dev_id) ...@@ -299,7 +299,7 @@ elsa_interrupt(int intno, void *dev_id)
val = serial_inp(cs, UART_IIR); val = serial_inp(cs, UART_IIR);
if (!(val & UART_IIR_NO_INT)) { if (!(val & UART_IIR_NO_INT)) {
debugl1(cs,"IIR %02x", val); debugl1(cs,"IIR %02x", val);
rs_interrupt_elsa(intno, cs); rs_interrupt_elsa(cs);
} }
} }
#endif #endif
...@@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id) ...@@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id)
val = serial_inp(cs, UART_IIR); val = serial_inp(cs, UART_IIR);
if (!(val & UART_IIR_NO_INT)) { if (!(val & UART_IIR_NO_INT)) {
debugl1(cs,"IIR %02x", val); debugl1(cs,"IIR %02x", val);
rs_interrupt_elsa(intno, cs); rs_interrupt_elsa(cs);
} }
} }
#endif #endif
......
...@@ -384,13 +384,13 @@ static inline void transmit_chars(struct IsdnCardState *cs, int *intr_done) ...@@ -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 status, iir, msr;
int pass_counter = 0; int pass_counter = 0;
#ifdef SERIAL_DEBUG_INTR #ifdef SERIAL_DEBUG_INTR
printk("rs_interrupt_single(%d)...", irq); printk(KERN_DEBUG "rs_interrupt_single(%d)...", cs->irq);
#endif #endif
do { do {
......
...@@ -925,7 +925,7 @@ struct IsdnCardState { ...@@ -925,7 +925,7 @@ struct IsdnCardState {
int (*cardmsg) (struct IsdnCardState *, int, void *); int (*cardmsg) (struct IsdnCardState *, int, void *);
void (*setstack_d) (struct PStack *, struct IsdnCardState *); void (*setstack_d) (struct PStack *, struct IsdnCardState *);
void (*DC_Close) (struct IsdnCardState *); void (*DC_Close) (struct IsdnCardState *);
int (*irq_func) (int, void *); irq_handler_t irq_func;
int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *); int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *);
struct Channel channel[2+MAX_WAITING_CALLS]; struct Channel channel[2+MAX_WAITING_CALLS];
struct BCState bcs[2+MAX_WAITING_CALLS]; struct BCState bcs[2+MAX_WAITING_CALLS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment