From 939cade68558efd6612ba14c145896f5af506ac9 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 20 Apr 2003 09:55:37 -0700 Subject: [PATCH] [SCSI QLOGICISP]: Update for irqreturn_t. --- drivers/scsi/qlogicisp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qlogicisp.c b/drivers/scsi/qlogicisp.c index 115210776a48a..2caa24a5f05f9 100644 --- a/drivers/scsi/qlogicisp.c +++ b/drivers/scsi/qlogicisp.c @@ -606,7 +606,7 @@ static int isp1020_load_parameters(struct Scsi_Host *); static int isp1020_mbox_command(struct Scsi_Host *, u_short []); static int isp1020_return_status(struct Status_Entry *); static void isp1020_intr_handler(int, void *, struct pt_regs *); -static void do_isp1020_intr_handler(int, void *, struct pt_regs *); +static irqreturn_t do_isp1020_intr_handler(int, void *, struct pt_regs *); #if USE_NVRAM_DEFAULTS static int isp1020_get_defaults(struct Scsi_Host *); @@ -965,7 +965,7 @@ int isp1020_queuecommand(Scsi_Cmnd *Cmnd, void (*done)(Scsi_Cmnd *)) #define ASYNC_EVENT_INTERRUPT 0x01 -void do_isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs) +irqreturn_t do_isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs) { struct Scsi_Host *host = dev_id; unsigned long flags; @@ -973,6 +973,8 @@ void do_isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs) spin_lock_irqsave(host->host_lock, flags); isp1020_intr_handler(irq, dev_id, regs); spin_unlock_irqrestore(host->host_lock, flags); + + return IRQ_HANDLED; } void isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs) -- 2.53.0