Commit 9cab3f14 authored by Paul Mackerras's avatar Paul Mackerras Committed by James Bottomley

[PATCH] Update mesh.c and mac53c94.c drivers

This patch updates the mesh and mac53c94 SCSI host bus adaptor
drivers so that their interrupt routines return an irqreturn_t.

Please apply.

Thanks,
Paul.
parent 0af08e0e
...@@ -59,7 +59,7 @@ static struct fsc_state *all_53c94s; ...@@ -59,7 +59,7 @@ static struct fsc_state *all_53c94s;
static void mac53c94_init(struct fsc_state *); static void mac53c94_init(struct fsc_state *);
static void mac53c94_start(struct fsc_state *); static void mac53c94_start(struct fsc_state *);
static void mac53c94_interrupt(int, void *, struct pt_regs *); static void mac53c94_interrupt(int, void *, struct pt_regs *);
static void do_mac53c94_interrupt(int, void *, struct pt_regs *); static irqreturn_t do_mac53c94_interrupt(int, void *, struct pt_regs *);
static void cmd_done(struct fsc_state *, int result); static void cmd_done(struct fsc_state *, int result);
static void set_dma_cmds(struct fsc_state *, Scsi_Cmnd *); static void set_dma_cmds(struct fsc_state *, Scsi_Cmnd *);
static int data_goes_out(Scsi_Cmnd *); static int data_goes_out(Scsi_Cmnd *);
...@@ -316,7 +316,7 @@ mac53c94_start(struct fsc_state *state) ...@@ -316,7 +316,7 @@ mac53c94_start(struct fsc_state *state)
set_dma_cmds(state, cmd); set_dma_cmds(state, cmd);
} }
static void static irqreturn_t
do_mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) do_mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
{ {
unsigned long flags; unsigned long flags;
...@@ -325,6 +325,7 @@ do_mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) ...@@ -325,6 +325,7 @@ do_mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
spin_lock_irqsave(dev->host_lock, flags); spin_lock_irqsave(dev->host_lock, flags);
mac53c94_interrupt(irq, dev_id, ptregs); mac53c94_interrupt(irq, dev_id, ptregs);
spin_unlock_irqrestore(dev->host_lock, flags); spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
} }
static void static void
......
...@@ -212,7 +212,7 @@ static void handle_reset(struct mesh_state *); ...@@ -212,7 +212,7 @@ static void handle_reset(struct mesh_state *);
static void handle_error(struct mesh_state *); static void handle_error(struct mesh_state *);
static void handle_exception(struct mesh_state *); static void handle_exception(struct mesh_state *);
static void mesh_interrupt(int, void *, struct pt_regs *); static void mesh_interrupt(int, void *, struct pt_regs *);
static void do_mesh_interrupt(int, void *, struct pt_regs *); static irqreturn_t do_mesh_interrupt(int, void *, struct pt_regs *);
static void handle_msgin(struct mesh_state *); static void handle_msgin(struct mesh_state *);
static void mesh_done(struct mesh_state *, int); static void mesh_done(struct mesh_state *, int);
static void mesh_completed(struct mesh_state *, Scsi_Cmnd *); static void mesh_completed(struct mesh_state *, Scsi_Cmnd *);
...@@ -1471,7 +1471,7 @@ handle_reset(struct mesh_state *ms) ...@@ -1471,7 +1471,7 @@ handle_reset(struct mesh_state *ms)
out_8(&mr->sequence, SEQ_ENBRESEL); out_8(&mr->sequence, SEQ_ENBRESEL);
} }
static void static irqreturn_t
do_mesh_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) do_mesh_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
{ {
unsigned long flags; unsigned long flags;
...@@ -1480,6 +1480,7 @@ do_mesh_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) ...@@ -1480,6 +1480,7 @@ do_mesh_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
spin_lock_irqsave(dev->host_lock, flags); spin_lock_irqsave(dev->host_lock, flags);
mesh_interrupt(irq, dev_id, ptregs); mesh_interrupt(irq, dev_id, ptregs);
spin_unlock_irqrestore(dev->host_lock, flags); spin_unlock_irqrestore(dev->host_lock, flags);
return IRQ_HANDLED;
} }
static void handle_error(struct mesh_state *ms) static void handle_error(struct mesh_state *ms)
......
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