scsi: zfcp: proper indentation to reduce confusion in zfcp_erp_required_act
authorSteffen Maier <maier@linux.ibm.com>
Fri, 25 Oct 2019 16:12:52 +0000 (18:12 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 29 Oct 2019 02:16:15 +0000 (22:16 -0400)
No functional change.

The unary not operator only applies to the sub expression before the
logical or. So we return early if (not running) or failed.

Link: https://lore.kernel.org/r/df4f897f6e83eaa528465d0858d5a22daac47a2f.1572018132.git.bblock@linux.ibm.com
Reviewed-by: Jens Remus <jremus@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/s390/scsi/zfcp_erp.c

index 96f0d34..93655b8 100644 (file)
@@ -174,7 +174,7 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want,
                        return 0;
                p_status = atomic_read(&port->status);
                if (!(p_status & ZFCP_STATUS_COMMON_RUNNING) ||
-                     p_status & ZFCP_STATUS_COMMON_ERP_FAILED)
+                   p_status & ZFCP_STATUS_COMMON_ERP_FAILED)
                        return 0;
                if (!(p_status & ZFCP_STATUS_COMMON_UNBLOCKED))
                        need = ZFCP_ERP_ACTION_REOPEN_PORT;
@@ -190,7 +190,7 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want,
                        return 0;
                a_status = atomic_read(&adapter->status);
                if (!(a_status & ZFCP_STATUS_COMMON_RUNNING) ||
-                     a_status & ZFCP_STATUS_COMMON_ERP_FAILED)
+                   a_status & ZFCP_STATUS_COMMON_ERP_FAILED)
                        return 0;
                if (p_status & ZFCP_STATUS_COMMON_NOESC)
                        return need;