From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3BD07330D54 for ; Fri, 13 Feb 2026 16:45:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771001106; cv=none; b=m44IjS9N65zg6s9ErrqSxlUHbrVgi8IsiTGET3yJoTwwOs7HRjlYGhMieIXuqFNg0MMXvQl4Y8HApVwP6WnSfFSUut5CW538JP7WXsRosr8d1ztL/xNuJQ16lL/NeYCYlmtZmnPsjOJhJQujdEKS7CzHlHhuoFY0rfUDhg/SGXo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771001106; c=relaxed/simple; bh=ErS7FcqxpgIDO9+PtTjDefIu/LDlYv+5sZfprvQyozU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hXh2NcjD4n62hsOglPmhlmJktMgPSbcwpO6QyXBMRf2eNHE2qVKt/D0OOIljwQDT7CFt5HLMHZMsTVrMWuA+iIXwLREVkQzYNHsBaxn133n9PL0P2LZdyYTmUS03VHSGrl0w/GNSk1KNIJhVOFgShjVA/r1UbTD5n+hys8Kh0qA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D6SjUb1d; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D6SjUb1d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 322CDC116C6; Fri, 13 Feb 2026 16:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771001105; bh=ErS7FcqxpgIDO9+PtTjDefIu/LDlYv+5sZfprvQyozU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D6SjUb1dA+7KbC91xkH8Vy17ByW6fY3Kd8alOBdZ5rOQDMJ9+E0R8s9qMfj1krJ4F SaUZMMnK2lb+tKpfIkFmbKcgKEFFyEBrtoHgVJg/ayae+zBS/WxP7Qm8O2JVbXlASC Qoz/6ZxjoUVLEMKdn/18TuRd6unIt9sqET6eb5PaPKsjGAGp5tVd7GY0D7KHnEW4rD VfWqfrFbLKtf/VnfhIgN5xruQc2ddb9pOWMKCQG6qPLXtsfGp3mzkzozsFhkVMWFmb CdU0+kQBedeREUOO4CbBTS+LnIiFfer7esCI2/gOg2BO/Tp2lLIPbNBeSJBMs6H2O6 Q1CRM2UAjjRxA== From: Sasha Levin To: stable@vger.kernel.org Cc: Gleb Chesnokov , Himanshu Madhani , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.15.y 1/4] scsi: qla2xxx: Use named initializers for port_[d]state_str Date: Fri, 13 Feb 2026 11:45:00 -0500 Message-ID: <20260213164503.3564614-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026021306-playful-overact-2bfb@gregkh> References: <2026021306-playful-overact-2bfb@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Gleb Chesnokov [ Upstream commit 6e0e85d39e528da2915a2da261195f81bfde6915 ] Make port_state_str and port_dstate_str a little more readable and maintainable by using named initializers. Also convert FCS_* macros into an enum. Link: https://lore.kernel.org/r/AS8PR10MB495215841EB25C16DBC0CB409D349@AS8PR10MB4952.EURPRD10.PROD.OUTLOOK.COM Reviewed-by: Himanshu Madhani Signed-off-by: Gleb Chesnokov Signed-off-by: Martin K. Petersen Stable-dep-of: 7adbd2b78090 ("scsi: qla2xxx: Free sp in error path to fix system crash") Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_def.h | 35 ++++++++++++++++++---------------- drivers/scsi/qla2xxx/qla_isr.c | 10 +++++----- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 02a2fd1b150a9..5416d1f776c1b 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -2689,25 +2689,28 @@ struct event_arg { /* * Fibre channel port/lun states. */ -#define FCS_UNCONFIGURED 1 -#define FCS_DEVICE_DEAD 2 -#define FCS_DEVICE_LOST 3 -#define FCS_ONLINE 4 +enum { + FCS_UNKNOWN, + FCS_UNCONFIGURED, + FCS_DEVICE_DEAD, + FCS_DEVICE_LOST, + FCS_ONLINE, +}; extern const char *const port_state_str[5]; -static const char * const port_dstate_str[] = { - "DELETED", - "GNN_ID", - "GNL", - "LOGIN_PEND", - "LOGIN_FAILED", - "GPDB", - "UPD_FCPORT", - "LOGIN_COMPLETE", - "ADISC", - "DELETE_PEND", - "LOGIN_AUTH_PEND", +static const char *const port_dstate_str[] = { + [DSC_DELETED] = "DELETED", + [DSC_GNN_ID] = "GNN_ID", + [DSC_GNL] = "GNL", + [DSC_LOGIN_PEND] = "LOGIN_PEND", + [DSC_LOGIN_FAILED] = "LOGIN_FAILED", + [DSC_GPDB] = "GPDB", + [DSC_UPD_FCPORT] = "UPD_FCPORT", + [DSC_LOGIN_COMPLETE] = "LOGIN_COMPLETE", + [DSC_ADISC] = "ADISC", + [DSC_DELETE_PEND] = "DELETE_PEND", + [DSC_LOGIN_AUTH_PEND] = "LOGIN_AUTH_PEND", }; /* diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 1459ae380389a..8b13797d210d1 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -49,11 +49,11 @@ qla27xx_process_purex_fpin(struct scsi_qla_host *vha, struct purex_item *item) } const char *const port_state_str[] = { - "Unknown", - "UNCONFIGURED", - "DEAD", - "LOST", - "ONLINE" + [FCS_UNKNOWN] = "Unknown", + [FCS_UNCONFIGURED] = "UNCONFIGURED", + [FCS_DEVICE_DEAD] = "DEAD", + [FCS_DEVICE_LOST] = "LOST", + [FCS_ONLINE] = "ONLINE" }; static void -- 2.51.0