RDMA: Remove unnecessary ternary operators

There are a little ternary operators, the true or false judgment
of which is unnecessary in C language semantics.

Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230731085118.394443-1-ruanjinjie@huawei.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 1b2cc9e45ade53d8fe2d99211c25c5b76207f48a..ae2db0c70788bff251cb46e21ab5980c3e0e48de 100644 (file)
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -75,7 +75,7 @@ static bool is_nl_msg_valid(unsigned int type, unsigned int op)
        if (type >= RDMA_NL_NUM_CLIENTS)
                return false;
 
-       return (op < max_num_ops[type]) ? true : false;
+       return op < max_num_ops[type];
 }
 
 static const struct rdma_nl_cbs *

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index 2b2505ad103d5315f8c71c3dde00705f12211c1c..c46fd2a47c959fe204cb1c32b5a716ad6a452293 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -1336,8 +1336,7 @@ static int bnxt_re_init_qp_attr(struct bnxt_re_qp *qp, struct bnxt_re_pd *pd,
        qplqp->pd = &pd->qplib_pd;
        qplqp->qp_handle = (u64)qplqp;
        qplqp->max_inline_data = init_attr->cap.max_inline_data;
-       qplqp->sig_type = ((init_attr->sq_sig_type == IB_SIGNAL_ALL_WR) ?
-                           true : false);
+       qplqp->sig_type = init_attr->sq_sig_type == IB_SIGNAL_ALL_WR;
        qptype = bnxt_re_init_qp_type(rdev, init_attr);
        if (qptype < 0) {
                rc = qptype;
@@ -2261,7 +2260,7 @@ static int bnxt_re_build_qp1_send_v2(struct bnxt_re_qp *qp,
        }
 
        is_eth = true;
-       is_vlan = (vlan_id && (vlan_id < 0x1000)) ? true : false;
+       is_vlan = vlan_id && (vlan_id < 0x1000);
 
        ib_ud_header_init(payload_size, !is_eth, is_eth, is_vlan, is_grh,
                          ip_version, is_udp, 0, &qp->qp1_hdr);

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 87960ac4208429e28eb8bf702190a36a94a738b9..d658e6798bbfdd1b2d2e887e2567d33693dc0012 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -433,8 +433,8 @@ int bnxt_re_hwrm_qcaps(struct bnxt_re_dev *rdev)
        cctx->modes.db_push = le32_to_cpu(resp.flags) & FUNC_QCAPS_RESP_FLAGS_WCB_PUSH_MODE;
 
        cctx->modes.dbr_pacing =
-               le32_to_cpu(resp.flags_ext2) & FUNC_QCAPS_RESP_FLAGS_EXT2_DBR_PACING_EXT_SUPPORTED ?
-               true : false;
+               le32_to_cpu(resp.flags_ext2) &
+               FUNC_QCAPS_RESP_FLAGS_EXT2_DBR_PACING_EXT_SUPPORTED;
        return 0;
 }
 
@@ -1333,8 +1333,7 @@ static int bnxt_re_setup_qos(struct bnxt_re_dev *rdev)
         */
        if ((prio_map == 0 && rdev->qplib_res.prio) ||
            (prio_map != 0 && !rdev->qplib_res.prio)) {
-               rdev->qplib_res.prio = prio_map ? true : false;
-
+               rdev->qplib_res.prio = prio_map;
                bnxt_re_update_gid(rdev);
        }
 

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
index 91aed77ce40d5f91f4622588ba691c100bc520bc..f9dee0d2da9c3452c8c182464562d31535e5640c 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
@@ -1373,8 +1373,7 @@ int bnxt_qplib_query_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)
        qp->state = sb->en_sqd_async_notify_state &
                        CREQ_QUERY_QP_RESP_SB_STATE_MASK;
        qp->en_sqd_async_notify = sb->en_sqd_async_notify_state &
-                                 CREQ_QUERY_QP_RESP_SB_EN_SQD_ASYNC_NOTIFY ?
-                                 true : false;
+                                 CREQ_QUERY_QP_RESP_SB_EN_SQD_ASYNC_NOTIFY;
        qp->access = sb->access;
        qp->pkey_index = le16_to_cpu(sb->pkey);
        qp->qkey = le32_to_cpu(sb->qkey);

diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c
index 47c0efed18211a31d38df3e7f8ee9f76038e279c..c4ac06a338696910939656703a308342832f5ba0 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hem.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hem.c
@@ -78,7 +78,7 @@ bool hns_roce_check_whether_mhop(struct hns_roce_dev *hr_dev, u32 type)
                return false;
        }
 
-       return hop_num ? true : false;
+       return hop_num;
 }
 
 static bool hns_roce_check_hem_null(struct hns_roce_hem **hem, u64 hem_idx,

diff --git a/drivers/infiniband/hw/irdma/uk.c b/drivers/infiniband/hw/irdma/uk.c
index ac650a784245b296d2f57f226ba931bbf07bcda0..6f9238c4fe20daf6021969e6fd863294dd45cc7a 100644 (file)
--- a/drivers/infiniband/hw/irdma/uk.c
+++ b/drivers/infiniband/hw/irdma/uk.c
@@ -282,7 +282,7 @@ int irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info,
        bool read_fence = false;
        u16 quanta;
 
-       info->push_wqe = qp->push_db ? true : false;
+       info->push_wqe = qp->push_db;
 
        op_info = &info->op.rdma_write;
        if (op_info->num_lo_sges > qp->max_sq_frag_cnt)
@@ -383,7 +383,7 @@ int irdma_uk_rdma_read(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info,
        u16 quanta;
        u64 hdr;
 
-       info->push_wqe = qp->push_db ? true : false;
+       info->push_wqe = qp->push_db;
 
        op_info = &info->op.rdma_read;
        if (qp->max_sq_frag_cnt < op_info->num_lo_sges)
@@ -468,7 +468,7 @@ int irdma_uk_send(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info,
        bool read_fence = false;
        u16 quanta;
 
-       info->push_wqe = qp->push_db ? true : false;
+       info->push_wqe = qp->push_db;
 
        op_info = &info->op.send;
        if (qp->max_sq_frag_cnt < op_info->num_sges)
@@ -720,7 +720,7 @@ int irdma_uk_inline_rdma_write(struct irdma_qp_uk *qp,
        u32 i, total_size = 0;
        u16 quanta;
 
-       info->push_wqe = qp->push_db ? true : false;
+       info->push_wqe = qp->push_db;
        op_info = &info->op.rdma_write;
 
        if (unlikely(qp->max_sq_frag_cnt < op_info->num_lo_sges))
@@ -794,7 +794,7 @@ int irdma_uk_inline_send(struct irdma_qp_uk *qp,
        u32 i, total_size = 0;
        u16 quanta;
 
-       info->push_wqe = qp->push_db ? true : false;
+       info->push_wqe = qp->push_db;
        op_info = &info->op.send;
 
        if (unlikely(qp->max_sq_frag_cnt < op_info->num_sges))
@@ -872,7 +872,7 @@ int irdma_uk_stag_local_invalidate(struct irdma_qp_uk *qp,
        bool local_fence = false;
        struct ib_sge sge = {};
 
-       info->push_wqe = qp->push_db ? true : false;
+       info->push_wqe = qp->push_db;
        op_info = &info->op.inv_local_stag;
        local_fence = info->local_fence;
 

diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
index b9420b0c42b33881b3e20474457a774d1509f354..0ca5b88d82e8efb46ed3dc7fb92b7b9c6b73b6f5 100644 (file)
--- a/drivers/infiniband/hw/irdma/verbs.c
+++ b/drivers/infiniband/hw/irdma/verbs.c
@@ -1004,7 +1004,7 @@ static int irdma_create_qp(struct ib_qp *ibqp,
        refcount_set(&iwqp->refcnt, 1);
        spin_lock_init(&iwqp->lock);
        spin_lock_init(&iwqp->sc_qp.pfpdu.lock);
-       iwqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR) ? 1 : 0;
+       iwqp->sig_all = init_attr->sq_sig_type == IB_SIGNAL_ALL_WR;
        rf->qp_table[qp_num] = iwqp;
 
        if (rdma_protocol_roce(&iwdev->ibdev, 1)) {
@@ -3547,8 +3547,7 @@ static void irdma_process_cqe(struct ib_wc *entry,
                set_ib_wc_op_sq(cq_poll_info, entry);
        } else {
                set_ib_wc_op_rq(cq_poll_info, entry,
-                               qp->qp_uk.qp_caps & IRDMA_SEND_WITH_IMM ?
-                               true : false);
+                               qp->qp_uk.qp_caps & IRDMA_SEND_WITH_IMM);
                if (qp->qp_uk.qp_type != IRDMA_QP_TYPE_ROCE_UD &&
                    cq_poll_info->stag_invalid_set) {
                        entry->ex.invalidate_rkey = cq_poll_info->inv_stag;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 58f994341e9acd6fdaf211868042d472a72d1c7d..c849fdbd4c994d7d63291c631fb478ac46326e04 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1277,7 +1277,7 @@ static void ocrdma_set_qp_init_params(struct ocrdma_qp *qp,
        qp->sq.max_sges = attrs->cap.max_send_sge;
        qp->rq.max_sges = attrs->cap.max_recv_sge;
        qp->state = OCRDMA_QPS_RST;
-       qp->signaled = (attrs->sq_sig_type == IB_SIGNAL_ALL_WR) ? true : false;
+       qp->signaled = attrs->sq_sig_type == IB_SIGNAL_ALL_WR;
 }
 
 static void ocrdma_store_gsi_qp_cq(struct ocrdma_dev *dev,

diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index d745ce9dc88aa89381c6ee2d1d98de3460ee2933..7887a6786ed43d6917a97b2dfbd8770c49383fbd 100644 (file)
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -1358,7 +1358,7 @@ static void qedr_set_common_qp_params(struct qedr_dev *dev,
 
        qp->prev_wqe_size = 0;
 
-       qp->signaled = (attrs->sq_sig_type == IB_SIGNAL_ALL_WR) ? true : false;
+       qp->signaled = attrs->sq_sig_type == IB_SIGNAL_ALL_WR;
        qp->dev = dev;
        if (qedr_qp_has_sq(qp)) {
                qedr_reset_qp_hwq_info(&qp->sq);