isdn/sc: irq handler clean
Karsten Keil
Acked-bycommit ebf0fb18d5c19bb0201912850d14a9fda292ee0e
Author: Jeff Garzik <[email protected]> Date: Fri Oct 19 19:31:27 2007 -0400
isdn/sc: irq handler clean
* pass card number to irq handler
* use card number in irq handler to avoid looping through each adapter
Acked-by Karsten Keil <[email protected]>
Signed-off-by Jeff Garzik <[email protected]>
drivers/isdn/sc/init.c | 3 ++- drivers/isdn/sc/interrupt.c | 17 ++--------------- 2 files changed, 4 insertions(+), 16 deletions(-)
ebf0fb18d5c19bb0201912850d14a9fda292ee0e
drivers/isdn/sc/init.c +2 -1
@@ -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 */
drivers/isdn/sc/interrupt.c +2 -15
@@ -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);
Signature · 4 lines
Karsten Keil SuSE Labs ISDN and VOIP development SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)