diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 19:31:27 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 19:53:16 -0400 |
commit | 080eb42f31a8a6dde1568f906692d9914cdfbfe8 (patch) | |
tree | bddb8ebfac4dc381989a8c8695a8578b5a83021c /drivers/isdn/sc/interrupt.c | |
parent | 246f93f5cc0d4116cadf33ad1c8ae7ac08e9b1c7 (diff) |
isdn/sc: irq handler clean
* pass card number to irq handler
* use card number in irq handler to avoid looping through each adapter
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/isdn/sc/interrupt.c')
-rw-r--r-- | drivers/isdn/sc/interrupt.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c index bef7963cdd02..485be8b1e1b3 100644 --- a/drivers/isdn/sc/interrupt.c +++ b/drivers/isdn/sc/interrupt.c | |||
@@ -21,28 +21,15 @@ | |||
21 | #include "card.h" | 21 | #include "card.h" |
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | 23 | ||
24 | static int get_card_from_irq(int irq) | ||
25 | { | ||
26 | int i; | ||
27 | |||
28 | for(i = 0 ; i < cinst ; i++) { | ||
29 | if(sc_adapter[i]->interrupt == irq) | ||
30 | return i; | ||
31 | } | ||
32 | return -1; | ||
33 | } | ||
34 | |||
35 | /* | 24 | /* |
36 | * | 25 | * |
37 | */ | 26 | */ |
38 | irqreturn_t interrupt_handler(int interrupt, void *cardptr) | 27 | irqreturn_t interrupt_handler(int dummy, void *card_inst) |
39 | { | 28 | { |
40 | 29 | ||
41 | RspMessage rcvmsg; | 30 | RspMessage rcvmsg; |
42 | int channel; | 31 | int channel; |
43 | int card; | 32 | int card = (int)(unsigned long) card_inst; |
44 | |||
45 | card = get_card_from_irq(interrupt); | ||
46 | 33 | ||
47 | if(!IS_VALID_CARD(card)) { | 34 | if(!IS_VALID_CARD(card)) { |
48 | pr_debug("Invalid param: %d is not a valid card id\n", card); | 35 | pr_debug("Invalid param: %d is not a valid card id\n", card); |