[028/117] aha*: Convert to the scsi_status union

Message ID 20210420000845.25873-29-bvanassche@acm.org
State New
Headers show
Series
  • Make better use of static type checking
Related show

Commit Message

Bart Van Assche April 20, 2021, 12:07 a.m.
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(-)

Patch

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index d8e19afa7a14..a1f5764d3577 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -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);
 		}
 
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 21aab9f5b117..4d4864120f30 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -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;
 	}
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 0dc831026e9e..a105599872e8 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -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;
 	}