Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@xxxxxxxxx>
---
drivers/scsi/bfa/bfa_fcs_rport.c | 6 ++----
drivers/scsi/bfa/bfa_svc.c | 5 +----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/bfa/bfa_fcs_rport.c b/drivers/scsi/bfa/bfa_fcs_rport.c
index ce52a9c88ae6..41e55030596a 100644
--- a/drivers/scsi/bfa/bfa_fcs_rport.c
+++ b/drivers/scsi/bfa/bfa_fcs_rport.c
@@ -2555,10 +2555,8 @@ bfa_fcs_rport_update(struct bfa_fcs_rport_s *rport, struct fc_logi_s *plogi)
* - MAX receive frame size
*/
rport->cisc = plogi->csp.cisc;
- if (be16_to_cpu(plogi->class3.rxsz) < be16_to_cpu(plogi->csp.rxsz))
- rport->maxfrsize = be16_to_cpu(plogi->class3.rxsz);
- else
- rport->maxfrsize = be16_to_cpu(plogi->csp.rxsz);
+ rport->maxfrsize = min(be16_to_cpu(plogi->class3.rxsz),
+ be16_to_cpu(plogi->csp.rxsz));
bfa_trc(port->fcs, be16_to_cpu(plogi->csp.bbcred));
bfa_trc(port->fcs, port->fabric->bb_credit);
diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 9f33aa303b18..3cbe87fc343b 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -5257,10 +5257,7 @@ bfa_sgpg_mfree(struct bfa_s *bfa, struct list_head *sgpg_q, int nsgpg)
*/
do {
wqe = bfa_q_first(&mod->sgpg_wait_q);
- if (mod->free_sgpgs < wqe->nsgpg)
- nsgpg = mod->free_sgpgs;
- else
- nsgpg = wqe->nsgpg;
+ nsgpg = min(mod->free_sgpgs, wqe->nsgpg);
bfa_sgpg_malloc(bfa, &wqe->sgpg_q, nsgpg);
wqe->nsgpg -= nsgpg;
if (wqe->nsgpg == 0) {
--
2.45.1
