Home » Mailing list archives » linux-kernel » 2007 » October » 21

[PATCH 9/17] drivers/char/{synclink,tpm}: irq handler cleanups

Previous thread: [PATCH 8/17] arch/x86/kernel/vm86_32.c: irq handler cleanup by Jeff Garzik on Sunday, October 21, 2007 - 12:52 am. (2 messages)

Next thread: [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler by Jeff Garzik on Sunday, October 21, 2007 - 12:52 am. (1 message)
[view original message]
From: Jeff Garzik
Subject: [PATCH 9/17] drivers/char/{synclink,tpm}: irq handler cleanups
Date: Sunday, October 21, 2007 - 12:52 am

commit 81ccec23142e4fe42b3f72faecccb7b64f84007e
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Oct 19 19:27:19 2007 -0400

    drivers/char/{synclink,tpm}: irq handler cleanups
    
    * no need to use 'irq' function arg
    
    * delete pointless test, pointless casts
    
    * add KERN_xxx prefixes where appropriate
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

 drivers/char/synclink.c    |   21 +++++++++------------
 drivers/char/synclink_gt.c |   13 ++++---------
 drivers/char/synclinkmp.c  |   22 +++++++++-------------
 drivers/char/tpm/tpm_tis.c |    2 +-
 4 files changed, 23 insertions(+), 35 deletions(-)

81ccec23142e4fe42b3f72faecccb7b64f84007e
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 905d1f5..aa09909 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -1696,20 +1696,16 @@ static void mgsl_isr_transmit_dma( struct mgsl_struct *info )
  * 	
  * Return Value: None
  */
-static irqreturn_t mgsl_interrupt(int irq, void *dev_id)
+static irqreturn_t mgsl_interrupt(int dummy, void *dev_id)
 {
-	struct mgsl_struct * info;
+	struct mgsl_struct *info = dev_id;
 	u16 UscVector;
 	u16 DmaVector;
 
 	if ( debug_level >= DEBUG_LEVEL_ISR )	
-		printk("%s(%d):mgsl_interrupt(%d)entry.\n",
-			__FILE__,__LINE__,irq);
+		printk(KERN_DEBUG "%s(%d):mgsl_interrupt(%d)entry.\n",
+			__FILE__, __LINE__, info->irq_level);
 
-	info = (struct mgsl_struct *)dev_id;	
-	if (!info)
-		return IRQ_NONE;
-		
 	spin_lock(&info->irq_spinlock);
 
 	for(;;) {
@@ -1733,8 +1729,8 @@ static irqreturn_t mgsl_interrupt(int irq, void *dev_id)
 			mgsl_isr_receive_dma(info);
 
 		if ( info->isr_overflow ) {
-			printk(KERN_ERR"%s(%d):%s isr overflow irq=%d\n",
-				__FILE__,__LINE__,info->device_name, irq);
+			printk(KERN_ERR "%s(%d):%s isr overflow irq=%d\n",
+				__FILE__, __LINE__, info->device_name, info->irq_level);
 			usc_DisableMasterIrqBit(info);
 			usc_DisableDmaInterrupts(info,DICR_MASTER);
 			break;
@@ ...
[ message continues ]
Previous thread: [PATCH 8/17] arch/x86/kernel/vm86_32.c: irq handler cleanup by Jeff Garzik on Sunday, October 21, 2007 - 12:52 am. (2 messages)

Next thread: [PATCH 11/17] isdn/act2000: fix major bug. clean irq handler by Jeff Garzik on Sunday, October 21, 2007 - 12:52 am. (1 message)