diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-20 01:31:27 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-24 01:53:16 +0200 |
| commit | 080eb42f31a8a6dde1568f906692d9914cdfbfe8 (patch) | |
| tree | bddb8ebfac4dc381989a8c8695a8578b5a83021c /drivers/isdn | |
| parent | isdn/act2000: fix major bug. clean irq handler. (diff) | |
| download | linux-080eb42f31a8a6dde1568f906692d9914cdfbfe8.tar.xz linux-080eb42f31a8a6dde1568f906692d9914cdfbfe8.zip | |
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')
| -rw-r--r-- | drivers/isdn/sc/init.c | 3 | ||||
| -rw-r--r-- | drivers/isdn/sc/interrupt.c | 17 |
2 files changed, 4 insertions, 16 deletions
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index d09c854cfac7..dd0acd06750b 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c @@ -334,7 +334,8 @@ static int __init sc_init(void) */ sc_adapter[cinst]->interrupt = irq[b]; if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler, - IRQF_DISABLED, interface->id, NULL)) + IRQF_DISABLED, interface->id, + (void *)(unsigned long) cinst)) { kfree(sc_adapter[cinst]->channel); indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL); /* Fix me */ 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 @@ #include "card.h" #include <linux/interrupt.h> -static int get_card_from_irq(int irq) -{ - int i; - - for(i = 0 ; i < cinst ; i++) { - if(sc_adapter[i]->interrupt == irq) - return i; - } - return -1; -} - /* * */ -irqreturn_t interrupt_handler(int interrupt, void *cardptr) +irqreturn_t interrupt_handler(int dummy, void *card_inst) { RspMessage rcvmsg; int channel; - int card; - - card = get_card_from_irq(interrupt); + int card = (int)(unsigned long) card_inst; if(!IS_VALID_CARD(card)) { pr_debug("Invalid param: %d is not a valid card id\n", card); |