scsi: lpfc_els: use swap macro in lpfc_plogi_confirm_nport

PATCH New Gustavo A. R. Silva 1 participant 1 message Nov 3, 2017

Subsystems (2)

SCSI Emulex/Broadcom lpfc FC/FCoE SCSI driver

lore

Share & tools

lore

Gustavo A. R. Silva

author

2017-11-03 16:42 UTC #0 lore raw

PATCH 1/1 scsi: lpfc_els: use swap macro in lpfc_plogi_confirm_nport

Make use of the swap macro and remove unnecessary variable keep_nlp_flag. This makes the code easier to read and maintain.

This code was detected with the help of Coccinelle.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/scsi/lpfc/lpfc_els.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

drivers/scsi/lpfc/lpfc_els.c +2 -4

index b14f7c5..1b745fe 100644
@@ -1525,7 +1525,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
 	struct fc_rport *rport;
 	struct serv_parm *sp;
 	uint8_t  name[sizeof(struct lpfc_name)];
-	uint32_t rc, keepDID = 0, keep_nlp_flag = 0;
+	uint32_t rc, keepDID = 0;
 	uint16_t keep_nlp_state;
 	struct lpfc_nvme_rport *keep_nrport = NULL;
 	int  put_node;

@@ -1616,9 +1616,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
 		       phba->cfg_rrq_xri_bitmap_sz);
 
 	spin_lock_irq(shost->host_lock);
-	keep_nlp_flag = new_ndlp->nlp_flag;
-	new_ndlp->nlp_flag = ndlp->nlp_flag;
-	ndlp->nlp_flag = keep_nlp_flag;
+	swap(new_ndlp->nlp_flag, ndlp->nlp_flag);
 	spin_unlock_irq(shost->host_lock);
 
 	/* Set nlp_states accordingly */

Signature · 1 line

2.7.4