Commit 006631a8 authored by James Bottomley's avatar James Bottomley

irqreturn_t fixup for 53c700

parent 8b8b413e
...@@ -1432,7 +1432,7 @@ NCR_700_start_command(Scsi_Cmnd *SCp) ...@@ -1432,7 +1432,7 @@ NCR_700_start_command(Scsi_Cmnd *SCp)
return 1; return 1;
} }
void irqreturn_t
NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs) NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct Scsi_Host *host = (struct Scsi_Host *)dev_id; struct Scsi_Host *host = (struct Scsi_Host *)dev_id;
...@@ -1442,6 +1442,7 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1442,6 +1442,7 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs)
__u32 resume_offset = 0; __u32 resume_offset = 0;
__u8 pun = 0xff, lun = 0xff; __u8 pun = 0xff, lun = 0xff;
unsigned long flags; unsigned long flags;
irqreturn_t retval = IRQ_NONE;
/* Use the host lock to serialise acess to the 53c700 /* Use the host lock to serialise acess to the 53c700
* hardware. Note: In future, we may need to take the queue * hardware. Note: In future, we may need to take the queue
...@@ -1457,6 +1458,8 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1457,6 +1458,8 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs)
Scsi_Cmnd *SCp = hostdata->cmd; Scsi_Cmnd *SCp = hostdata->cmd;
enum NCR_700_Host_State state; enum NCR_700_Host_State state;
retval = IRQ_HANDLED;
state = hostdata->state; state = hostdata->state;
SCp = hostdata->cmd; SCp = hostdata->cmd;
...@@ -1697,6 +1700,7 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1697,6 +1700,7 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs)
} }
out_unlock: out_unlock:
spin_unlock_irqrestore(host->host_lock, flags); spin_unlock_irqrestore(host->host_lock, flags);
return retval;
} }
/* FIXME: Need to put some proc information in and plumb it /* FIXME: Need to put some proc information in and plumb it
......
...@@ -52,7 +52,7 @@ struct NCR_700_Host_Parameters; ...@@ -52,7 +52,7 @@ struct NCR_700_Host_Parameters;
/* These are the externally used routines */ /* These are the externally used routines */
struct Scsi_Host *NCR_700_detect(Scsi_Host_Template *, struct NCR_700_Host_Parameters *); struct Scsi_Host *NCR_700_detect(Scsi_Host_Template *, struct NCR_700_Host_Parameters *);
int NCR_700_release(struct Scsi_Host *host); int NCR_700_release(struct Scsi_Host *host);
void NCR_700_intr(int, void *, struct pt_regs *); irqreturn_t NCR_700_intr(int, void *, struct pt_regs *);
enum NCR_700_Host_State { enum NCR_700_Host_State {
......
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