Skip to content

L
linux
Commit 73f926bd authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SCSI QLOGICPTI]: Update for irqreturn_t.

parent 939cade6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
drivers/scsi/qlogicpti.c
View file @ 73f926bd
...@@ -644,7 +644,7 @@ static int qlogicpti_verify_tmon(struct qlogicpti *qpti) ...@@ -644,7 +644,7 @@ static int qlogicpti_verify_tmon(struct qlogicpti *qpti)
return 0; return 0;
} }
static void qpti_intr(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t qpti_intr(int irq, void *dev_id, struct pt_regs *regs);
static void __init qpti_chain_add(struct qlogicpti *qpti) static void __init qpti_chain_add(struct qlogicpti *qpti)
{ {
...@@ -1441,7 +1441,7 @@ static Scsi_Cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti) ...@@ -1441,7 +1441,7 @@ static Scsi_Cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
return done_queue; return done_queue;
} }
static void qpti_intr(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t qpti_intr(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct qlogicpti *qpti = dev_id; struct qlogicpti *qpti = dev_id;
unsigned long flags; unsigned long flags;
...@@ -1463,6 +1463,8 @@ static void qpti_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1463,6 +1463,8 @@ static void qpti_intr(int irq, void *dev_id, struct pt_regs *regs)
spin_unlock(qpti->qhost->host_lock); spin_unlock(qpti->qhost->host_lock);
} }
local_irq_restore(flags); local_irq_restore(flags);
return IRQ_HANDLED;
} }
static int qlogicpti_abort(Scsi_Cmnd *Cmnd) static int qlogicpti_abort(Scsi_Cmnd *Cmnd)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7