lkml.org 
[lkml]   [2007]   [Oct]   [21]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
FromJeff Garzik <>
Subject[PATCH 6/17] drivers/char/riscom8: irq handler cleanups
DateSun, 21 Oct 2007 03:52:25 -0400 (EDT)
commit 93ea6d56f83b7b614c103222fa098cb30d26f608
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Oct 19 16:41:23 2007 -0400

    drivers/char/riscom8: irq handler cleanups

    No need to lookup board ptr, we already have it.

    Also, remove a few 'inline' markers and let the compiler make that
    decision.

    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

 drivers/char/riscom8.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
93ea6d56f83b7b614c103222fa098cb30d26f608
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index b37e626..d307320 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -537,16 +537,14 @@ static inline void rc_check_modem(struct riscom_board const * bp)
 }
 
 /* The main interrupt processing routine */
-static irqreturn_t rc_interrupt(int irq, void * dev_id)
+static irqreturn_t rc_interrupt(int dummy, void * dev_id)
 {
 	unsigned char status;
 	unsigned char ack;
-	struct riscom_board *bp;
+	struct riscom_board *bp = dev_id;
 	unsigned long loop = 0;
 	int handled = 0;
 
-	bp = IRQ_to_board[irq];
-
 	if (!(bp->flags & RC_BOARD_ACTIVE))
 		return IRQ_NONE;
 
@@ -603,7 +601,7 @@ static irqreturn_t rc_interrupt(int irq, void * dev_id)
  */
 
 /* Called with disabled interrupts */
-static inline int rc_setup_board(struct riscom_board * bp)
+static int rc_setup_board(struct riscom_board * bp)
 {
 	int error;
 
@@ -611,7 +609,7 @@ static inline int rc_setup_board(struct riscom_board * bp)
 		return 0;
 	
 	error = request_irq(bp->irq, rc_interrupt, IRQF_DISABLED,
-			    "RISCom/8", NULL);
+			    "RISCom/8", bp);
 	if (error) 
 		return error;
 	
@@ -626,7 +624,7 @@ static inline int rc_setup_board(struct riscom_board * bp)
 }
 
 /* Called with disabled interrupts */
-static inline void rc_shutdown_board(struct riscom_board *bp)
+static void rc_shutdown_board(struct riscom_board *bp)
 {
 	if (!(bp->flags & RC_BOARD_ACTIVE))
 		return;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2007-10-21 07:59    [from the cache]
©2003-2008