@@ -1281,7 +1281,7 @@ static void done(struct Scsi_Host *shpnt, int error)
DONE_SC = CURRENT_SC;
CURRENT_SC = NULL;
- DONE_SC->result = error;
+ DONE_SC->status.combined = error;
} else
printk(KERN_ERR "aha152x: done() called outside of command\n");
}
@@ -2254,7 +2254,7 @@ static void rsti_run(struct Scsi_Host *shpnt)
kfree(ptr->host_scribble);
ptr->host_scribble=NULL;
- ptr->result = DID_RESET << 16;
+ ptr->status.combined = DID_RESET << 16;
ptr->scsi_done(ptr);
}
@@ -398,7 +398,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
if (errstatus)
printk("aha1542_intr_handle: returning %6x\n", errstatus);
#endif
- tmp_cmd->result = errstatus;
+ tmp_cmd->status.combined = errstatus;
aha1542->int_cmds[mbo] = NULL; /* This effectively frees up the mailbox slot, as
* far as queuecommand is concerned
*/
@@ -422,7 +422,7 @@ static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
if (*cmd->cmnd == REQUEST_SENSE) {
/* Don't do the command - we have the sense data already */
- cmd->result = 0;
+ cmd->status.combined = 0;
cmd->scsi_done(cmd);
return 0;
}
@@ -275,7 +275,7 @@ static irqreturn_t aha1740_intr_handle(int irq, void *dev_id)
DEB(if (errstatus)
printk("aha1740_intr_handle: returning %6x\n",
errstatus));
- SCtmp->result = errstatus;
+ SCtmp->status.combined = errstatus;
my_done = ecbptr->done;
memset(ecbptr,0,sizeof(struct ecb));
if ( my_done )
@@ -326,7 +326,7 @@ static int aha1740_queuecommand_lck(struct scsi_cmnd * SCpnt,
DEB(int i);
if(*cmd == REQUEST_SENSE) {
- SCpnt->result = 0;
+ SCpnt->status.combined = 0;
done(SCpnt);
return 0;
}
An explanation of the purpose of this patch is available in the patch "scsi: Introduce the scsi_status union". Cc: "Juergen E. Fischer" <fischer@norbit.de> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/aha152x.c | 4 ++-- drivers/scsi/aha1542.c | 4 ++-- drivers/scsi/aha1740.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)