Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 <himanshu.madhani@oracle.com>
Signed-off-by: Gleb Chesnokov <Chesnokov.G@raidix.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Gleb Chesnokov 2022-02-15 17:13:53 +00:00 committed by Martin K. Petersen
parent 482dcaa1c9
commit 6e0e85d39e
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/scsi/qla2xxx/qla_def.h
View File

@ -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",
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",
};
/*

10
drivers/scsi/qla2xxx/qla_isr.c
View File

@ -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