[v1] scsi: qla2xxx: Simplify if condition evaluation

[PATCH] scsi: qla2xxx: Simplify if condition evaluation

Posted by Deepak R Varma 2 years, 8 months ago

A logical evaluation of type (!A || A && B) can be simplified as
(!A || B).
Improvement by suggested by excluded_middle.cocci Coccinelel semantic
patch.

Signed-off-by: Deepak R Varma <drv@mailo.com>
---
Please note: Change is compile tested only.

 drivers/scsi/qla2xxx/qla_target.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 548f22705ddc..bf6aacf4dbd1 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1028,8 +1028,7 @@ void qlt_free_session_done(struct work_struct *work)
 		}
 
 		if (ha->flags.edif_enabled &&
-		    (!own || (own &&
-			      own->iocb.u.isp24.status_subcode == ELS_PLOGI))) {
+				(own && own->iocb.u.isp24.status_subcode == ELS_PLOGI)) {
 			sess->edif.authok = 0;
 			if (!ha->flags.host_shutting_down) {
 				ql_dbg(ql_dbg_edif, vha, 0x911e,
-- 
2.34.1

Re: [PATCH] scsi: qla2xxx: Simplify if condition evaluation

Posted by Lee Duncan 2 years, 8 months ago

On 1/11/23 11:01, Deepak R Varma wrote:
> A logical evaluation of type (!A || A && B) can be simplified as
> (!A || B).
> Improvement by suggested by excluded_middle.cocci Coccinelel semantic
> patch.
> 
> Signed-off-by: Deepak R Varma <drv@mailo.com>
> ---
> Please note: Change is compile tested only.
> 
>   drivers/scsi/qla2xxx/qla_target.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
> index 548f22705ddc..bf6aacf4dbd1 100644
> --- a/drivers/scsi/qla2xxx/qla_target.c
> +++ b/drivers/scsi/qla2xxx/qla_target.c
> @@ -1028,8 +1028,7 @@ void qlt_free_session_done(struct work_struct *work)
>   		}
>   
>   		if (ha->flags.edif_enabled &&
> -		    (!own || (own &&
> -			      own->iocb.u.isp24.status_subcode == ELS_PLOGI))) {
> +				(own && own->iocb.u.isp24.status_subcode == ELS_PLOGI)) {
>   			sess->edif.authok = 0;
>   			if (!ha->flags.host_shutting_down) {
>   				ql_dbg(ql_dbg_edif, vha, 0x911e,

It seems like you missed something in the translation. You left of the 
"!own" in your replacement. You are translating (!A || A && B) as (A && B).

--
Lee Duncan

Re: [PATCH] scsi: qla2xxx: Simplify if condition evaluation

Posted by Deepak R Varma 2 years, 8 months ago

On Wed, Jan 11, 2023 at 07:26:32PM -0800, Lee Duncan wrote:
> On 1/11/23 11:01, Deepak R Varma wrote:
> > A logical evaluation of type (!A || A && B) can be simplified as
> > (!A || B).
> > Improvement by suggested by excluded_middle.cocci Coccinelel semantic
> > patch.
> > 
> > Signed-off-by: Deepak R Varma <drv@mailo.com>
> > ---
> > Please note: Change is compile tested only.
> > 
> >   drivers/scsi/qla2xxx/qla_target.c | 3 +--
> >   1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
> > index 548f22705ddc..bf6aacf4dbd1 100644
> > --- a/drivers/scsi/qla2xxx/qla_target.c
> > +++ b/drivers/scsi/qla2xxx/qla_target.c
> > @@ -1028,8 +1028,7 @@ void qlt_free_session_done(struct work_struct *work)
> >   		}
> >   		if (ha->flags.edif_enabled &&
> > -		    (!own || (own &&
> > -			      own->iocb.u.isp24.status_subcode == ELS_PLOGI))) {
> > +				(own && own->iocb.u.isp24.status_subcode == ELS_PLOGI)) {
> >   			sess->edif.authok = 0;
> >   			if (!ha->flags.host_shutting_down) {
> >   				ql_dbg(ql_dbg_edif, vha, 0x911e,
> 
> It seems like you missed something in the translation. You left of the
> "!own" in your replacement. You are translating (!A || A && B) as (A && B).

Thanks for catching that. My bad. I will correct and send in v2.

Regards,
./drv

> 
> --
> Lee Duncan
>