From e0e724f022a1d4e33ec14d8b47a08e539d9b1349 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 28 Nov 2012 14:00:16 +0000 Subject: [PATCH] qla2x00t: q2t_pci_map_calc_cnt() cleanup and microoptimization (merge r4273 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4631 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x00-target/qla2x00t.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c index 17d09cba9..97865b581 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.c +++ b/qla2x00t/qla2x00-target/qla2x00t.c @@ -2038,14 +2038,9 @@ static int q2t_pci_map_calc_cnt(struct q2t_prm *prm) * If greater than four sg entries then we need to allocate * the continuation entries */ - if (prm->seg_cnt > prm->tgt->datasegs_per_cmd) { - prm->req_cnt += (uint16_t)(prm->seg_cnt - - prm->tgt->datasegs_per_cmd) / - prm->tgt->datasegs_per_cont; - if (((uint16_t)(prm->seg_cnt - prm->tgt->datasegs_per_cmd)) % - prm->tgt->datasegs_per_cont) - prm->req_cnt++; - } + if (prm->seg_cnt > prm->tgt->datasegs_per_cmd) + prm->req_cnt += DIV_ROUND_UP(prm->seg_cnt - prm->tgt->datasegs_per_cmd, + prm->tgt->datasegs_per_cont); out: TRACE_DBG("seg_cnt=%d, req_cnt=%d, res=%d", prm->seg_cnt,