@@ -2317,12 +2317,7 @@ sli_xmit_bls_rsp64_wqe(struct sli4 *sli, void *buf,
SLI4_GENERIC_CONTEXT_VPI << SLI4_BLS_RSP_WQE_CT_SHFT;
bls->context_tag = cpu_to_le16(params->vpi);
- if (params->s_id != U32_MAX)
- bls->local_n_port_id_dword |=
- cpu_to_le32(params->s_id & 0x00ffffff);
- else
- bls->local_n_port_id_dword |=
- cpu_to_le32(params->s_id & 0x00ffffff);
+ bls->local_n_port_id_dword |= cpu_to_le32(params->s_id & 0x00ffffff);
dw_ridflags = (dw_ridflags & ~SLI4_BLS_RSP_RID) |
(params->d_id & SLI4_BLS_RSP_RID);
The if and else branches have the exact same code, which then always executes independent of the condition evaluation. Simplify the code by removing the redundant branching. Issue identified using the cond_no_effect Coccinelle semantic patch. Signed-off-by: Deepak R Varma <drv@mailo.com> --- drivers/scsi/elx/libefc_sli/sli4.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.34.1