diff options
| author | Roland Dreier <roland@topspin.com> | 2005-04-16 15:26:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:26:32 -0700 |
| commit | d10ddbf6d7f6699c386d1f41bf542189de32b6be (patch) | |
| tree | b2e3ab95925407472fa9c62bb6016d85f822cb68 /drivers/infiniband/hw/mthca/mthca_cq.c | |
| parent | 6bd6228eed52ef188ebe46865ccff72da936c968 (diff) | |
[PATCH] IB/mthca: encapsulate mem-free check into mthca_is_memfree()
Clean up mem-free mode support by introducing mthca_is_memfree() function,
which encapsulates the logic of deciding if a device is mem-free.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_cq.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_cq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c index 0ad954e18bd..2bf347b84c3 100644 --- a/drivers/infiniband/hw/mthca/mthca_cq.c +++ b/drivers/infiniband/hw/mthca/mthca_cq.c @@ -180,7 +180,7 @@ static inline void update_cons_index(struct mthca_dev *dev, struct mthca_cq *cq, { u32 doorbell[2]; - if (dev->hca_type == ARBEL_NATIVE) { + if (mthca_is_memfree(dev)) { *cq->set_ci_db = cpu_to_be32(cq->cons_index); wmb(); } else { @@ -760,7 +760,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, if (cq->cqn == -1) return -ENOMEM; - if (dev->hca_type == ARBEL_NATIVE) { + if (mthca_is_memfree(dev)) { cq->arm_sn = 1; err = mthca_table_get(dev, dev->cq_table.table, cq->cqn); @@ -811,7 +811,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, cq_context->lkey = cpu_to_be32(cq->mr.ibmr.lkey); cq_context->cqn = cpu_to_be32(cq->cqn); - if (dev->hca_type == ARBEL_NATIVE) { + if (mthca_is_memfree(dev)) { cq_context->ci_db = cpu_to_be32(cq->set_ci_db_index); cq_context->state_db = cpu_to_be32(cq->arm_db_index); } @@ -851,11 +851,11 @@ err_out_free_mr: err_out_mailbox: kfree(mailbox); - if (dev->hca_type == ARBEL_NATIVE) + if (mthca_is_memfree(dev)) mthca_free_db(dev, MTHCA_DB_TYPE_CQ_ARM, cq->arm_db_index); err_out_ci: - if (dev->hca_type == ARBEL_NATIVE) + if (mthca_is_memfree(dev)) mthca_free_db(dev, MTHCA_DB_TYPE_CQ_SET_CI, cq->set_ci_db_index); err_out_icm: @@ -916,7 +916,7 @@ void mthca_free_cq(struct mthca_dev *dev, mthca_free_mr(dev, &cq->mr); mthca_free_cq_buf(dev, cq); - if (dev->hca_type == ARBEL_NATIVE) { + if (mthca_is_memfree(dev)) { mthca_free_db(dev, MTHCA_DB_TYPE_CQ_ARM, cq->arm_db_index); mthca_free_db(dev, MTHCA_DB_TYPE_CQ_SET_CI, cq->set_ci_db_index); mthca_table_put(dev, dev->cq_table.table, cq->cqn); |