mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* Re: [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler
@ 2007-10-22 12:02 Karsten Keil
  0 siblings, 0 replies; 2+ messages in thread
From: Karsten Keil @ 2007-10-22 12:02 UTC (permalink / raw)
  To: LKML; +Cc: akpm

commit e295b1287f0f559f4795ae75acb793b480594a04
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Oct 19 19:30:28 2007 -0400

    isdn/act2000: fix major bug. clean irq handler.
    
    * invert sense of request_irq() test.  otherwise we will always fail,
      when IRQ is available.
    
    * no need to use 'irq' function arg, its stored in a data struct already
    
    Acked-by: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

 drivers/isdn/act2000/act2000_isa.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

e295b1287f0f559f4795ae75acb793b480594a04
diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c
index 819ea85..1bd8960 100644
--- a/drivers/isdn/act2000/act2000_isa.c
+++ b/drivers/isdn/act2000/act2000_isa.c
@@ -61,7 +61,7 @@ act2000_isa_detect(unsigned short portbase)
 }
 
 static irqreturn_t
-act2000_isa_interrupt(int irq, void *dev_id)
+act2000_isa_interrupt(int dummy, void *dev_id)
 {
         act2000_card *card = dev_id;
         u_char istatus;
@@ -80,7 +80,7 @@ act2000_isa_interrupt(int irq, void *dev_id)
                 printk(KERN_WARNING "act2000: errIRQ\n");
         }
 	if (istatus)
-		printk(KERN_DEBUG "act2000: ?IRQ %d %02x\n", irq, istatus);
+		printk(KERN_DEBUG "act2000: ?IRQ %d %02x\n", card->irq, istatus);
 	return IRQ_HANDLED;
 }
 
@@ -131,6 +131,8 @@ act2000_isa_enable_irq(act2000_card * card)
 int
 act2000_isa_config_irq(act2000_card * card, short irq)
 {
+	int old_irq;
+
         if (card->flags & ACT2000_FLAGS_IVALID) {
                 free_irq(card->irq, card);
         }
@@ -139,8 +141,10 @@ act2000_isa_config_irq(act2000_card * card, short irq)
         if (!irq)
                 return 0;
 
-	if (!request_irq(irq, &act2000_isa_interrupt, 0, card->regname, card)) {
-		card->irq = irq;
+	old_irq = card->irq;
+	card->irq = irq;
+	if (request_irq(irq, &act2000_isa_interrupt, 0, card->regname, card)) {
+		card->irq = old_irq;
 		card->flags |= ACT2000_FLAGS_IVALID;
                 printk(KERN_WARNING
                        "act2000: Could not request irq %d\n",irq);


-- 
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)

^ permalink raw reply	[flat|nested] 2+ messages in thread
* [PATCH 0/17] various irq handler cleanups
@ 2007-10-21  7:52 Jeff Garzik
  2007-10-21  7:52 ` [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Jeff Garzik @ 2007-10-21  7:52 UTC (permalink / raw)
  To: LKML

This series continues the work of running through irq handlers that use
their 'irq' argument -- almost always for trivial (or even wrong)
reasons.

In many cases, this work eliminates some pointless code in the fastpath,
and/or otherwise makes interrupt handling [ever so] slightly more
efficient and clean.

As usual, this work is being committed to the 'irq-cleanups' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git

which encompasses the following changes (includes some previously
posted, and not re-posted in this series):

older cleanups:
      [PARPORT] Consolidate code copies into a single generic irq handler
      [PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interru
      [PARPORT] Remove unused 'irq' argument from parport irq functions
      [BLUETOOTH] Eliminate checks for impossible conditions in irq handler
      Eliminate pointless casts from void* in a few driver irq handlers.
      [SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
      [NETDRVR] lib82596, netxen: delete pointless tests from irq handler
      [SCSI] aha152x: delete pointless test in irq handler
      [ATM, CHAR, TOUCHSCREEN] remove needless use of irq handler first arg

new cleanups:
      [IRQ ARG CLEANUP] more driver cleanups
      drivers/char/ip2: split out irq core logic into separate function
      drivers/char/ip2: separate polling and irq-driven work entry points
      char/pcmcia/synclink_cs: trim trailing whitespace
      drivers/char/pcmcia/synclink_cs.c: irq handler cleanups
      drivers/char/riscom8: irq handler cleanups
      drivers/char/{rio,specialix,sx}: irq handler cleanups
      arch/x86/kernel/vm86_32.c: irq handler cleanup
      drivers/char/{synclink,tpm}: irq handler cleanups
      drivers/input/serio/i8042.c: irq handler clean
      isdn/act2000: fix major bug. clean irq handler.
      isdn/sc: irq handler clean
      [netdrvr] driver irq handler cleanups
      pcmcia/i82365: irq handler cleanups
      serial, rtc/ds1374: irq handler cleanups
      [SCSI] driver irq handler cleanups
      RTC interrupt handling cleanups


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-22 12:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-22 12:02 [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler Karsten Keil
  -- strict thread matches above, loose matches on Subject: below --
2007-10-21  7:52 [PATCH 0/17] various irq handler cleanups Jeff Garzik
2007-10-21  7:52 ` [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®