[106/117] wd33c93: Convert to the scsi_status union

Message ID	20210420021402.27678-16-bvanassche@acm.org (mailing list archive)
State	Deferred
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: "Martin K . Petersen" <martin.petersen@oracle.com>, "James E . J . Bottomley" <jejb@linux.vnet.ibm.com> Cc: linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Bart Van Assche <bvanassche@acm.org>, Don Brace <don.brace@microchip.com>, Hannes Reinecke <hare@suse.de> Subject: [PATCH 106/117] wd33c93: Convert to the scsi_status union Date: Mon, 19 Apr 2021 19:13:51 -0700 Message-Id: <20210420021402.27678-16-bvanassche@acm.org> In-Reply-To: <20210420000845.25873-1-bvanassche@acm.org> References: <20210420000845.25873-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Make better use of static type checking \| expand [000/117] Make better use of static type checking [001/117] libsas: Introduce more SAM status code aliases in enum exec_status [002/117] Introduce enums for the SAM, message, host and driver status codes [003/117] Change the type of the second argument of scsi_host_complete_all_commands() [004/117] libiscsi: Use the host_status enum [005/117] libsas: Use the host_status and sam_status enums [006/117] target: Use enum sam_status instead of u8 [007/117] lpfc: Reformat four comparisons [008/117] fc: Add a compile-time structure size check [009/117] iscsi: Add a compile-time structure size check [010/117] ufs: Add a compile-time structure size check [011/117] Introduce the scsi_status union [012/117] block: Convert SCSI and bsg code to the scsi_status union [013/117] core: Convert to the scsi_status union [014/117] ch: Pass union scsi_status to driver_byte() [015/117] sd: Convert to the scsi_status union [016/117] sr: Convert to the scsi_status union [017/117] st: Convert to the scsi_status union [018/117] sg: Convert to the scsi_status union [019/117] 3w: Convert to the scsi_status union [020/117] 53c700: Convert to the scsi_status union [021/117] BusLogic: Convert to the scsi_status union [022/117] NCR5380: Convert to the scsi_status union [023/117] a100u2w: Convert to the scsi_status union [024/117] aacraid: Convert to the scsi_status union [025/117] acornscsi: Annotate fallthrough [026/117] acornscsi: Convert to the scsi_status union [027/117] advansys: Convert to the scsi_status union [028/117] aha: Convert to the scsi_status union [029/117] aic*: Convert to the scsi_status union [030/117] arcmsr: Convert to the scsi_status union [031/117] ata: Convert to the scsi_status union [032/117] atp870u: Convert to the scsi_status union [033/117] be2iscsi: Convert to the scsi_status union [034/117] bfa: Use type int32_t to represent a signed integer [035/117] bfa: Convert to the scsi_status union [036/117] bnx2fc: Convert to the scsi_status union [037/117] cdrom: Convert to the scsi_status union [038/117] csiostor: Convert to the scsi_status union [039/117] cxlflash: Convert to the scsi_status union [040/117] dc395x: Use the set_{host,msg,status}_byte() functions [041/117] dc395x: Convert to the scsi_status union [042/117] dpt_i2o: Convert to the scsi_status union [043/117] esas2r: Convert to the scsi_status union [044/117] esp_scsi: Convert to the scsi_status union [045/117] fas216: Fix two source code comments [046/117] fas216: Convert to the scsi_status union [047/117] fc: Convert to the scsi_status union [048/117] fdomain: Convert to the scsi_status union [049/117] firewire: sbp2: Convert to the scsi_status union [050/117] fnic: Convert to the scsi_status union [051/117] hpsa: Convert to the scsi_status union [052/117] hptiop: Convert to the scsi_status union [053/117] ib_srp: Convert to the scsi_status union [054/117] ibmvfc: Fix the documentation of the return value of ibmvfc_host_chkready() [055/117] ibmvfc: Convert to the scsi_status union [056/117] ibmvscsi: Convert to the scsi_status union [057/117] ide: Convert to the scsi_status union [058/117] imm: Convert to the scsi_status union [059/117] initio: Convert to the scsi_status union [060/117] ipr: Convert to the scsi_status union [061/117] ips: Convert to the scsi_status union [062/117] iscsi: Convert to the scsi_status union [063/117] libfc: Convert to the scsi_status union [064/117] sas: Convert to the scsi_status union [065/117] lpfc: Convert to the scsi_status union [066/117] mac53c94: Convert to the scsi_status union [067/117] megaraid: Convert to the scsi_status union [068/117] mesh: Convert to the scsi_status union [069/117] message: fusion: Convert to the scsi_status union [070/117] mpt3sas: Convert to the scsi_status union [071/117] mvumi: Convert to the scsi_status union [072/117] myrb: Convert to the scsi_status union [073/117] myrs: Convert to the scsi_status union [074/117] ncr53c8xx: Convert to the scsi_status union [075/117] nfsd: Convert to the scsi_status union [076/117] nsp32: Convert to the scsi_status union [077/117] pcmcia: Convert to the scsi_status union [078/117] pktcdvd: Convert to the scsi_status union [079/117] pmcraid: Convert to the scsi_status union [080/117] ppa: Convert to the scsi_status union [081/117] ps3rom: Convert to the scsi_status union [082/117] qedf: Convert to the scsi_status union [083/117] qedi: Convert to the scsi_status union [084/117] qla1280: Convert to the scsi_status union [085/117] qla2xxx: Convert to the scsi_status union [086/117] qla4xxx: Convert to the scsi_status union [087/117] qlogicfas408: Convert to the scsi_status union [088/117] qlogicpti: Convert to the scsi_status union [089/117] s390/zfcp: Convert to the scsi_status union [090/117] scsi_debug: Convert to the scsi_status union [091/117] smartpqi: Convert to the scsi_status union [092/117] snic: Convert to the scsi_status union [093/117] staging: Convert to the scsi_status union [094/117] stex: Convert to the scsi_status union [095/117] storvsc: Convert to the scsi_status union [096/117] sym53c8xx_2: Convert to the scsi_status union [097/117] target: Convert to the scsi_status union [098/117] ufs: Remove an unused structure member [099/117] ufs: Remove a local variable [100/117] ufs: Use enum sam_status where appropriate [101/117] ufs: Remove an assignment from ufshcd_transfer_rsp_status() [102/117] ufs: Convert to the scsi_status union [103/117] usb: Convert to the scsi_status union [104/117] virtio-scsi: Convert to the scsi_status union [105/117] vmw_pvscsi: Convert to the scsi_status union [106/117] wd33c93: Convert to the scsi_status union [107/117] wd719x: Convert to the scsi_status union [108/117] xen-scsiback: Pass union status to the {status,msg,host,driver}_byte() macros [109/117] xen-scsifront: Convert to the scsi_status union [110/117] Finalize the switch from 'int' to 'union scsi_status' [111/117] Use the scsi_status union more widely [112/117] Change the return type of scsi_execute() into union scsi_status [113/117] Change the return type of scsi_execute_req() into union scsi_status [114/117] Change the return type of scsi_test_unit_ready() into union scsi_status [115/117] Change the return types of scsi_mode_sense() and sd_do_mode_sense() [116/117] Change the return type of scsi_mode_select() into union scsi_status [117/117] Change the return type of ioctl_internal_command() into union scsi_status

Message ID

20210420021402.27678-16-bvanassche@acm.org (mailing list archive)

State

Deferred

Headers

From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
        "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
        Bart Van Assche <bvanassche@acm.org>,
        Don Brace <don.brace@microchip.com>,
        Hannes Reinecke <hare@suse.de>
Subject: [PATCH 106/117] wd33c93: Convert to the scsi_status union
Date: Mon, 19 Apr 2021 19:13:51 -0700
Message-Id: <20210420021402.27678-16-bvanassche@acm.org>
In-Reply-To: <20210420000845.25873-1-bvanassche@acm.org>
References: <20210420000845.25873-1-bvanassche@acm.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Make better use of static type checking | expand

Commit Message

Bart Van Assche April 20, 2021, 2:13 a.m. UTC

An explanation of the purpose of this patch is available in the patch
"scsi: Introduce the scsi_status union".

Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/wd33c93.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index a23277bb870e..a4efe6fcb982 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -381,7 +381,7 @@  wd33c93_queuecommand_lck(struct scsi_cmnd *cmd,
  */
 	cmd->host_scribble = NULL;
 	cmd->scsi_done = done;
-	cmd->result = 0;
+	cmd->status.combined = 0;
 
 /* We use the Scsi_Pointer structure that's included with each command
  * as a scratchpad (as it's intended to be used!). The handy thing about
@@ -853,7 +853,7 @@  wd33c93_intr(struct Scsi_Host *instance)
 			hostdata->selecting = NULL;
 		}
 
-		cmd->result = DID_NO_CONNECT << 16;
+		cmd->status.combined = DID_NO_CONNECT << 16;
 		hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
 		hostdata->state = S_UNCONNECTED;
 		cmd->scsi_done(cmd);
@@ -1177,11 +1177,10 @@  wd33c93_intr(struct Scsi_Host *instance)
 				cmd->SCp.Status = lun;
 			if (cmd->cmnd[0] == REQUEST_SENSE
 			    && cmd->SCp.Status != SAM_STAT_GOOD)
-				cmd->result =
-				    (cmd->
-				     result & 0x00ffff) | (DID_ERROR << 16);
+				cmd->status.combined =
+				    (cmd->status.combined & 0x00ffff) | (DID_ERROR << 16);
 			else
-				cmd->result =
+				cmd->status.combined =
 				    cmd->SCp.Status | (cmd->SCp.Message << 8);
 			cmd->scsi_done(cmd);
 
@@ -1263,10 +1262,10 @@  wd33c93_intr(struct Scsi_Host *instance)
 		hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
 		hostdata->state = S_UNCONNECTED;
 		if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != SAM_STAT_GOOD)
-			cmd->result =
-			    (cmd->result & 0x00ffff) | (DID_ERROR << 16);
+			cmd->status.combined =
+			    (cmd->status.combined & 0x00ffff) | (DID_ERROR << 16);
 		else
-			cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
+			cmd->status.combined = cmd->SCp.Status | (cmd->SCp.Message << 8);
 		cmd->scsi_done(cmd);
 
 /* We are no longer connected to a target - check to see if
@@ -1297,11 +1296,10 @@  wd33c93_intr(struct Scsi_Host *instance)
 			DB(DB_INTR, printk(":%d", cmd->SCp.Status))
 			    if (cmd->cmnd[0] == REQUEST_SENSE
 				&& cmd->SCp.Status != SAM_STAT_GOOD)
-				cmd->result =
-				    (cmd->
-				     result & 0x00ffff) | (DID_ERROR << 16);
+				cmd->status.combined =
+				    (cmd->status.combined & 0x00ffff) | (DID_ERROR << 16);
 			else
-				cmd->result =
+				cmd->status.combined =
 				    cmd->SCp.Status | (cmd->SCp.Message << 8);
 			cmd->scsi_done(cmd);
 			break;
@@ -1593,7 +1591,7 @@  wd33c93_host_reset(struct scsi_cmnd * SCpnt)
 	hostdata->outgoing_len = 0;
 
 	reset_wd33c93(instance);
-	SCpnt->result = DID_RESET << 16;
+	SCpnt->status.combined = DID_RESET << 16;
 	enable_irq(instance->irq);
 	spin_unlock_irq(instance->host_lock);
 	return SUCCESS;
@@ -1628,7 +1626,7 @@  wd33c93_abort(struct scsi_cmnd * cmd)
 				hostdata->input_Q =
 				    (struct scsi_cmnd *) cmd->host_scribble;
 			cmd->host_scribble = NULL;
-			cmd->result = DID_ABORT << 16;
+			cmd->status.combined = DID_ABORT << 16;
 			printk
 			    ("scsi%d: Abort - removing command from input_Q. ",
 			     instance->host_no);
@@ -1702,7 +1700,7 @@  wd33c93_abort(struct scsi_cmnd * cmd)
 		hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
 		hostdata->connected = NULL;
 		hostdata->state = S_UNCONNECTED;
-		cmd->result = DID_ABORT << 16;
+		cmd->status.combined = DID_ABORT << 16;
 
 /*      sti();*/
 		wd33c93_execute(instance);

[106/117] wd33c93: Convert to the scsi_status union

Commit Message

Patch