[052/117] hptiop: Convert to the scsi_status union

Message ID	20210420000845.25873-53-bvanassche@acm.org
State	New
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> Subject: [PATCH 052/117] hptiop: Convert to the scsi_status union Date: Mon, 19 Apr 2021 17:07:40 -0700 Message-Id: <20210420000845.25873-53-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 [002/117] Introduce enums for the SAM, message, host and driver status codes [004/117] libiscsi: Use the host_status enum [006/117] target: Use enum sam_status instead of u8 [007/117] lpfc: Reformat four comparisons [010/117] ufs: Add a compile-time structure size check [012/117] block: Convert SCSI and bsg code to the scsi_status union [013/117] core: Convert to the scsi_status union [017/117] st: Convert to the scsi_status union [018/117] sg: Convert to the scsi_status union [020/117] 53c700: Convert to the scsi_status union [022/117] NCR5380: Convert to the scsi_status union [024/117] aacraid: Convert to the scsi_status union [027/117] advansys: Convert to the scsi_status union [028/117] aha*: Convert to the scsi_status union [030/117] arcmsr: Convert to the scsi_status union [032/117] atp870u: Convert to the scsi_status union [034/117] bfa: Use type int32_t to represent a signed integer [036/117] bnx2fc: 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 [042/117] dpt_i2o: Convert to the scsi_status union [043/117] esas2r: Convert to the scsi_status union [046/117] fas216: Convert to the scsi_status union [048/117] fdomain: Convert to the scsi_status union [050/117] fnic: Convert to the scsi_status union [052/117] hptiop: Convert to the scsi_status union [054/117] ibmvfc: Fix the documentation of the return value of ibmvfc_host_chkready() [056/117] ibmvscsi: Convert to the scsi_status union [058/117] imm: Convert to the scsi_status union [060/117] ipr: Convert to the scsi_status union [062/117] iscsi: Convert to the scsi_status union [064/117] sas: Convert to the scsi_status union [065/117] lpfc: Convert to the scsi_status union [068/117] mesh: Convert to the scsi_status union [070/117] mpt3sas: Convert to the scsi_status union [072/117] myrb: Convert to the scsi_status union [074/117] ncr53c8xx: Convert to the scsi_status union [075/117] nfsd: Convert to the scsi_status union [077/117] pcmcia: Convert to the scsi_status union [081/117] ps3rom: Convert to the scsi_status union [082/117] qedf: Convert to the scsi_status union [084/117] qla1280: Convert to the scsi_status union [086/117] qla4xxx: Convert to the scsi_status union [088/117] qlogicpti: 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 [093/117] staging: Convert to the scsi_status union [095/117] storvsc: Convert to the scsi_status union [097/117] target: Convert to the scsi_status union [100/117] ufs: Use enum sam_status where appropriate [101/117] ufs: Remove an assignment from ufshcd_transfer_rsp_status() [103/117] usb: Convert to the scsi_status union [105/117] vmw_pvscsi: 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 [111/117] Use the scsi_status union more widely [113/117] Change the return type of scsi_execute_req() into union scsi_status [115/117] Change the return types of scsi_mode_sense() and sd_do_mode_sense() [117/117] Change the return type of ioctl_internal_command() into union scsi_status

Message ID

20210420000845.25873-53-bvanassche@acm.org

State

New

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>
Subject: [PATCH 052/117] hptiop: Convert to the scsi_status union
Date: Mon, 19 Apr 2021 17:07:40 -0700
Message-Id: <20210420000845.25873-53-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, 12:07 a.m. UTC

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

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/hptiop.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index db4c7a7ff4dd..4cb92937164a 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -735,32 +735,32 @@  static void hptiop_finish_scsi_req(struct hptiop_hba *hba, u32 tag,
 	case IOP_RESULT_SUCCESS:
 		scsi_set_resid(scp,
 			scsi_bufflen(scp) - le32_to_cpu(req->dataxfer_length));
-		scp->result = (DID_OK<<16);
+		scp->status.combined = (DID_OK<<16);
 		break;
 	case IOP_RESULT_BAD_TARGET:
-		scp->result = (DID_BAD_TARGET<<16);
+		scp->status.combined = (DID_BAD_TARGET<<16);
 		break;
 	case IOP_RESULT_BUSY:
-		scp->result = (DID_BUS_BUSY<<16);
+		scp->status.combined = (DID_BUS_BUSY<<16);
 		break;
 	case IOP_RESULT_RESET:
-		scp->result = (DID_RESET<<16);
+		scp->status.combined = (DID_RESET<<16);
 		break;
 	case IOP_RESULT_FAIL:
-		scp->result = (DID_ERROR<<16);
+		scp->status.combined = (DID_ERROR<<16);
 		break;
 	case IOP_RESULT_INVALID_REQUEST:
-		scp->result = (DID_ABORT<<16);
+		scp->status.combined = (DID_ABORT<<16);
 		break;
 	case IOP_RESULT_CHECK_CONDITION:
 		scsi_set_resid(scp,
 			scsi_bufflen(scp) - le32_to_cpu(req->dataxfer_length));
-		scp->result = SAM_STAT_CHECK_CONDITION;
+		scp->status.combined = SAM_STAT_CHECK_CONDITION;
 		memcpy(scp->sense_buffer, &req->sg_list, SCSI_SENSE_BUFFERSIZE);
 		goto skip_resid;
 
 	default:
-		scp->result = DRIVER_INVALID << 24 | DID_ABORT << 16;
+		scp->status.combined = DRIVER_INVALID << 24 | DID_ABORT << 16;
 		break;
 	}
 
@@ -1024,12 +1024,12 @@  static int hptiop_queuecommand_lck(struct scsi_cmnd *scp,
 			cpu_to_be32(((u32 *)scp->cmnd)[3]),
 			_req->index, _req->req_virt);
 
-	scp->result = 0;
+	scp->status.combined = 0;
 
 	if (scp->device->channel ||
 			(scp->device->id > hba->max_devices) ||
 			((scp->device->id == (hba->max_devices-1)) && scp->device->lun)) {
-		scp->result = DID_BAD_TARGET << 16;
+		scp->status.combined = DID_BAD_TARGET << 16;
 		free_req(hba, _req);
 		goto cmd_done;
 	}

[052/117] hptiop: Convert to the scsi_status union

Commit Message

Patch