hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: zfcp: zfcp_erp_action_exists() does only check for running 

Simplify its signature to return boolean and rename it to
zfcp_erp_action_is_running() to indicate its actual unmodified semantics.
It has always been used like this since v2.6.0 history commit ea127f975424
("[PATCH] s390 (7/7): zfcp host adapter.").

Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Steffen Maier 2018-05-17 19:15:00 +02:00 committed by Martin K. Petersen
parent cd4a186aaa
commit 013af857d8
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/s390/scsi/zfcp_erp.c
View File

@ -57,10 +57,6 @@ enum zfcp_erp_act_type {
ZFCP_ERP_ACTION_FAILED = 0xe0, ZFCP_ERP_ACTION_FAILED = 0xe0,
}; };
enum zfcp_erp_act_state {
ZFCP_ERP_ACTION_RUNNING = 1,
};
enum zfcp_erp_act_result { enum zfcp_erp_act_result {
ZFCP_ERP_SUCCEEDED = 0, ZFCP_ERP_SUCCEEDED = 0,
ZFCP_ERP_FAILED = 1, ZFCP_ERP_FAILED = 1,
@ -76,14 +72,14 @@ static void zfcp_erp_adapter_block(struct zfcp_adapter *adapter, int mask)
ZFCP_STATUS_COMMON_UNBLOCKED | mask); ZFCP_STATUS_COMMON_UNBLOCKED | mask);
} }
static int zfcp_erp_action_exists(struct zfcp_erp_action *act) static bool zfcp_erp_action_is_running(struct zfcp_erp_action *act)
{ {
struct zfcp_erp_action *curr_act; struct zfcp_erp_action *curr_act;
list_for_each_entry(curr_act, &act->adapter->erp_running_head, list) list_for_each_entry(curr_act, &act->adapter->erp_running_head, list)
if (act == curr_act) if (act == curr_act)
return ZFCP_ERP_ACTION_RUNNING; return true;
return 0; return false;
} }
static void zfcp_erp_action_ready(struct zfcp_erp_action *act) static void zfcp_erp_action_ready(struct zfcp_erp_action *act)
@ -99,7 +95,7 @@ static void zfcp_erp_action_ready(struct zfcp_erp_action *act)
static void zfcp_erp_action_dismiss(struct zfcp_erp_action *act) static void zfcp_erp_action_dismiss(struct zfcp_erp_action *act)
{ {
act->status |= ZFCP_STATUS_ERP_DISMISSED; act->status |= ZFCP_STATUS_ERP_DISMISSED;
if (zfcp_erp_action_exists(act) == ZFCP_ERP_ACTION_RUNNING) if (zfcp_erp_action_is_running(act))
zfcp_erp_action_ready(act); zfcp_erp_action_ready(act);
} }
@ -622,7 +618,7 @@ void zfcp_erp_notify(struct zfcp_erp_action *erp_action, unsigned long set_mask)
unsigned long flags; unsigned long flags;
write_lock_irqsave(&adapter->erp_lock, flags); write_lock_irqsave(&adapter->erp_lock, flags);
if (zfcp_erp_action_exists(erp_action) == ZFCP_ERP_ACTION_RUNNING) { if (zfcp_erp_action_is_running(erp_action)) {
erp_action->status |= set_mask; erp_action->status |= set_mask;
zfcp_erp_action_ready(erp_action); zfcp_erp_action_ready(erp_action);
} }