diff options
| -rw-r--r-- | drivers/isdn/hisax/elsa.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/hisax/elsa_ser.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/hisax/hisax.h | 2 |
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) | |||
| 299 | val = serial_inp(cs, UART_IIR); | 299 | val = serial_inp(cs, UART_IIR); |
| 300 | if (!(val & UART_IIR_NO_INT)) { | 300 | if (!(val & UART_IIR_NO_INT)) { |
| 301 | debugl1(cs,"IIR %02x", val); | 301 | debugl1(cs,"IIR %02x", val); |
| 302 | rs_interrupt_elsa(intno, cs); | 302 | rs_interrupt_elsa(cs); |
| 303 | } | 303 | } |
| 304 | } | 304 | } |
| 305 | #endif | 305 | #endif |
| @@ -379,7 +379,7 @@ elsa_interrupt_ipac(int intno, void *dev_id) | |||
| 379 | val = serial_inp(cs, UART_IIR); | 379 | val = serial_inp(cs, UART_IIR); |
| 380 | if (!(val & UART_IIR_NO_INT)) { | 380 | if (!(val & UART_IIR_NO_INT)) { |
| 381 | debugl1(cs,"IIR %02x", val); | 381 | debugl1(cs,"IIR %02x", val); |
| 382 | rs_interrupt_elsa(intno, cs); | 382 | rs_interrupt_elsa(cs); |
| 383 | } | 383 | } |
| 384 | } | 384 | } |
| 385 | #endif | 385 | #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) | |||
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | 386 | ||
| 387 | static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs) | 387 | static void rs_interrupt_elsa(struct IsdnCardState *cs) |
| 388 | { | 388 | { |
| 389 | int status, iir, msr; | 389 | int status, iir, msr; |
| 390 | int pass_counter = 0; | 390 | int pass_counter = 0; |
| 391 | 391 | ||
| 392 | #ifdef SERIAL_DEBUG_INTR | 392 | #ifdef SERIAL_DEBUG_INTR |
| 393 | printk("rs_interrupt_single(%d)...", irq); | 393 | printk(KERN_DEBUG "rs_interrupt_single(%d)...", cs->irq); |
| 394 | #endif | 394 | #endif |
| 395 | 395 | ||
| 396 | do { | 396 | 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 { | |||
| 925 | int (*cardmsg) (struct IsdnCardState *, int, void *); | 925 | int (*cardmsg) (struct IsdnCardState *, int, void *); |
| 926 | void (*setstack_d) (struct PStack *, struct IsdnCardState *); | 926 | void (*setstack_d) (struct PStack *, struct IsdnCardState *); |
| 927 | void (*DC_Close) (struct IsdnCardState *); | 927 | void (*DC_Close) (struct IsdnCardState *); |
| 928 | int (*irq_func) (int, void *); | 928 | irq_handler_t irq_func; |
| 929 | int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *); | 929 | int (*auxcmd) (struct IsdnCardState *, isdn_ctrl *); |
| 930 | struct Channel channel[2+MAX_WAITING_CALLS]; | 930 | struct Channel channel[2+MAX_WAITING_CALLS]; |
| 931 | struct BCState bcs[2+MAX_WAITING_CALLS]; | 931 | struct BCState bcs[2+MAX_WAITING_CALLS]; |
