diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-04-20 09:54:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-04-20 09:54:23 -0700 |
| commit | 923d18647d4e4cffc8937b042bf1d596a323752b (patch) | |
| tree | 3ee071864f2d823b0a5c35f6d8d44ef3543b4462 /drivers/message | |
| parent | 707b47b7876f74f69775b7d332823f88490715ee (diff) | |
[MESSAGE FUSION]: Update for irqreturn_t.
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index c5ca2e8cfa24..0b69156158fb 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -179,7 +179,7 @@ static DECLARE_WAIT_QUEUE_HEAD(mpt_waitq); /* * Forward protos... */ -static void mpt_interrupt(int irq, void *bus_id, struct pt_regs *r); +static irqreturn_t mpt_interrupt(int irq, void *bus_id, struct pt_regs *r); static int mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply); static int mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag); @@ -312,7 +312,7 @@ static inline u32 CHIPREG_PIO_READ32(volatile u32 *a) * dispatches (calls) a protocol-specific callback routine to handle * the protocol-specific details of the MPT request completion. */ -static void +static irqreturn_t mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) { MPT_ADAPTER *ioc; @@ -338,7 +338,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) if (!iocCmp) { printk(KERN_WARNING "mpt_interrupt: Invalid ioc!\n"); - return; + return IRQ_NONE; } } @@ -353,7 +353,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) while (1) { if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) == 0xFFFFFFFF) - return; + return IRQ_HANDLED; cb_idx = 0; freeme = 0; @@ -501,10 +501,12 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) dirqprintk((MYIOC_s_INFO_FMT "ISR processed %d replies.", ioc->name, count)); dirqprintk((" Giving this ISR a break!\n")); - return; + return IRQ_HANDLED; } } /* drain reply FIFO */ + + return IRQ_HANDLED; } /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |