Commit 6e0e85d3 authored by Gleb Chesnokov's avatar Gleb Chesnokov Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Use named initializers for port_[d]state_str 

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: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarGleb Chesnokov <Chesnokov.G@raidix.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 482dcaa1

drivers/scsi/qla2xxx/qla_def.h

+19 −16
Original line number Diff line number Diff line
@@ -2671,25 +2671,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",

	[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",

};



/*

drivers/scsi/qla2xxx/qla_isr.c

+5 −5
Original line number Diff line number Diff line
@@ -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