From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CAB84AD7E6; Tue, 8 Sep 2026 09:03:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858244; cv=none; b=TbJ4WKgAvuD+N439+Qomay0UwolGT2YI0eupkbXmxm+coaeKUBM7a4A1OT4SQ7vpWQ6ZdY5XXr9SLU7EHaaxHr2jLH2bpH/KIhYUbFVTVZwY1eEvtmgV+li9/rpp3QIl8XQJW1IEZlPlUZTi3Fhc6hieJwiqjLgp1S7kt5t44xo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858244; c=relaxed/simple; bh=we9Lo4ZT2mUlfoc7H5Z6vqqfI9VF4B0mfK5hGULPy4I=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=agjTdMc2piCbs/4bwYpBlffRIrwbALxppae+4pMKG4vd/fgo2hfumXlmmCNRD038+1Kj4PlrlkYaHuXcm+Dkk6YloQNnAIadQ4Uws5Q+SI8XHngWmK1PFswAvBou8aCS/EkqEtqXsQuEJkO9Yoj2BPgYNZMZCOCNCG4bwieoaqI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iCYAeA47; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iCYAeA47" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33C6E1F00ADF; Tue, 8 Sep 2026 09:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788858237; bh=bS5aQArDKJIkewHhdkIcO5WndLX+NnWeChkPSrR5Xkw=; h=From:To:Subject:Date:In-Reply-To:References; b=iCYAeA47mkGmqu9Y9R/D3k+3Yl8PmmyX6P44QiXOMVj4fpK+aUK70EV+TSJkQ09OA X5FR7a3L1mFgtepq+1O9PX/UPRQ/l1Pjv/wEX0pDwJ/JjIfzRtQ7xpHC8QvQkzLkbC PfRmXODnOMD21YbtGbtkebfntw2foc3MUwj8tFf0982V9uhXDAidsJjXrRYMq3emJK aJlidqlB62BL4nWn+FQQUlixyWjfaeypUW1CsvMgC4xzKdsdhBI4On1K8sez+LhteQ FaiIaMa1y96xBgCj2vBiGwFy8zjooalEhcTx5g7VGIgaLUsGmeqLpSntW+XbxGfs/7 Ds19LuHUp2Rgg== From: Damien Le Moal To: "Martin K . Petersen" , "James E . J . Bottomley" , linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, Niklas Cassel , linux-usb@vger.kernel.org, Alan Stern , Greg Kroah-Hartman , linux-s390@vger.kernel.org, Heiko Carstens Subject: [PATCH v6 21/40] scsi: megaraid: use 16-bits defined sense codes Date: Tue, 8 Sep 2026 18:02:49 +0900 Message-ID: <20260908090308.1085097-22-dlemoal@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260908090308.1085097-1-dlemoal@kernel.org> References: <20260908090308.1085097-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor the megaraid driver to use the scsi_set_sense() function and replace all hard-coded additional sense codes and additional sense code qualifiers with the enum values defined in include/scsi/scsi_sense.h. This helps with code clarity as the sense codes being processed are easier to test and self-documented. No functional change intended. Signed-off-by: Damien Le Moal Reviewed-by: Johannes Thumshirn Reviewed-by: Hannes Reinecke --- drivers/scsi/megaraid.c | 8 +++++--- drivers/scsi/megaraid/mega_common.h | 2 -- drivers/scsi/megaraid/megaraid_mbox.c | 12 +++++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 9476a0d2c72d..a4079866f747 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -1592,9 +1592,11 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) epthru->reqsensearea, 14); cmd->result = SAM_STAT_CHECK_CONDITION; - } else - scsi_build_sense(cmd, 0, - ABORTED_COMMAND, 0, 0); + } else { + scsi_set_sense(cmd, 0, + ABORTED_COMMAND, + NO_ADDITIONAL_SENSE_INFORMATION); + } } break; diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h index 2ad0aa2f837d..8e58599d5685 100644 --- a/drivers/scsi/megaraid/mega_common.h +++ b/drivers/scsi/megaraid/mega_common.h @@ -37,8 +37,6 @@ #define PCI_CONF_AMISIG64 0xa4 #define MEGA_SCSI_INQ_EVPD 1 -#define MEGA_INVALID_FIELD_IN_CDB 0x24 - /** * scb_t - scsi command control block diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index ce89032a5a74..b7319282e3c5 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c @@ -1577,8 +1577,8 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, } if (scp->cmnd[1] & MEGA_SCSI_INQ_EVPD) { - scsi_build_sense(scp, 0, ILLEGAL_REQUEST, - MEGA_INVALID_FIELD_IN_CDB, 0); + scsi_set_sense(scp, 0, ILLEGAL_REQUEST, + INVALID_FIELD_IN_CDB); return NULL; } @@ -2311,9 +2311,11 @@ megaraid_mbox_dpc(unsigned long devp) epthru->reqsensearea, 14); scp->result = SAM_STAT_CHECK_CONDITION; - } else - scsi_build_sense(scp, 0, - ABORTED_COMMAND, 0, 0); + } else { + scsi_set_sense(scp, 0, + ABORTED_COMMAND, + NO_ADDITIONAL_SENSE_INFORMATION); + } } break; -- 2.55.0