scsi: bnx2fc: Remove a duplicate assignment in two functions

[PATCH v2] scsi: bnx2fc: Remove a duplicate assignment in two functions

Posted by Minjie Du 2 years, 7 months ago

Delete a duplicate statement from these function implementations.

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 776544385..0474fe88a 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -1521,8 +1521,6 @@ void bnx2fc_init_seq_cleanup_task(struct bnx2fc_cmd *seq_clnp_req,
 				FCOE_TCE_TX_WR_RX_RD_CONST_CLASS_TYPE_SHIFT;
 	task->rxwr_txrd.const_ctx.init_flags = context_id <<
 				FCOE_TCE_RX_WR_TX_RD_CONST_CID_SHIFT;
-	task->rxwr_txrd.const_ctx.init_flags = context_id <<
-				FCOE_TCE_RX_WR_TX_RD_CONST_CID_SHIFT;
 
 	task->txwr_rxrd.union_ctx.cleanup.ctx.cleaned_task_id = orig_xid;
 
@@ -1763,7 +1761,6 @@ void bnx2fc_init_task(struct bnx2fc_cmd *io_req,
 				FCOE_TASK_DEV_TYPE_TAPE <<
 				FCOE_TCE_TX_WR_RX_RD_CONST_DEV_TYPE_SHIFT;
 		io_req->rec_retry = 0;
-		io_req->rec_retry = 0;
 	} else
 		task->txwr_rxrd.const_ctx.init_flags |=
 				FCOE_TASK_DEV_TYPE_DISK <<
-- 
2.39.0

Re: [PATCH v2] scsi: bnx2fc: Remove a duplicate assignment in two functions

Posted by Laurence Oberman 2 years, 7 months ago

On Wed, 2023-07-05 at 19:52 +0800, Minjie Du wrote:
> Delete a duplicate statement from these function implementations.
> 
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> ---
>  drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> index 776544385..0474fe88a 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> @@ -1521,8 +1521,6 @@ void bnx2fc_init_seq_cleanup_task(struct
> bnx2fc_cmd *seq_clnp_req,
>                                 FCOE_TCE_TX_WR_RX_RD_CONST_CLASS_TYPE
> _SHIFT;
>         task->rxwr_txrd.const_ctx.init_flags = context_id <<
>                                 FCOE_TCE_RX_WR_TX_RD_CONST_CID_SHIFT;
> -       task->rxwr_txrd.const_ctx.init_flags = context_id <<
> -                               FCOE_TCE_RX_WR_TX_RD_CONST_CID_SHIFT;
>  
>         task->txwr_rxrd.union_ctx.cleanup.ctx.cleaned_task_id =
> orig_xid;
>  
> @@ -1763,7 +1761,6 @@ void bnx2fc_init_task(struct bnx2fc_cmd
> *io_req,
>                                 FCOE_TASK_DEV_TYPE_TAPE <<
>                                 FCOE_TCE_TX_WR_RX_RD_CONST_DEV_TYPE_S
> HIFT;
>                 io_req->rec_retry = 0;
> -               io_req->rec_retry = 0;
>         } else
>                 task->txwr_rxrd.const_ctx.init_flags |=
>                                 FCOE_TASK_DEV_TYPE_DISK <<

Looks good to me:

Reviewed-by: Laurence Oberman <loberman@redhat.com>

Re: [PATCH v2] scsi: bnx2fc: Remove a duplicate assignment in two functions

Posted by Christophe JAILLET 2 years, 7 months ago

Le 05/07/2023 à 13:52, Minjie Du a écrit :
> Delete a duplicate statement from these function implementations.
> 
> Signed-off-by: Minjie Du <duminjie@vivo.com>
> ---
>   drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> index 776544385..0474fe88a 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> @@ -1521,8 +1521,6 @@ void bnx2fc_init_seq_cleanup_task(struct bnx2fc_cmd *seq_clnp_req,
>   				FCOE_TCE_TX_WR_RX_RD_CONST_CLASS_TYPE_SHIFT;
>   	task->rxwr_txrd.const_ctx.init_flags = context_id <<
>   				FCOE_TCE_RX_WR_TX_RD_CONST_CID_SHIFT;
> -	task->rxwr_txrd.const_ctx.init_flags = context_id <<
> -				FCOE_TCE_RX_WR_TX_RD_CONST_CID_SHIFT;
>   
>   	task->txwr_rxrd.union_ctx.cleanup.ctx.cleaned_task_id = orig_xid;
>   
> @@ -1763,7 +1761,6 @@ void bnx2fc_init_task(struct bnx2fc_cmd *io_req,
>   				FCOE_TASK_DEV_TYPE_TAPE <<
>   				FCOE_TCE_TX_WR_RX_RD_CONST_DEV_TYPE_SHIFT;
>   		io_req->rec_retry = 0;
> -		io_req->rec_retry = 0;

Hi,

just a blind guess:
    io_req->srr_retry = 0;
            ~~~

?

>   	} else
>   		task->txwr_rxrd.const_ctx.init_flags |=
>   				FCOE_TASK_DEV_TYPE_DISK <<