Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Potnuri Bharat Teja <bharat@chelsio.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Leon Romanovsky <leon@kernel.org>,
        Bernard Metzler <bmt@zurich.ibm.com>,
        linux-rdma@vger.kernel.org (open list:CXGB4 IWARP RNIC DRIVER
        (IW_CXGB4)), linux-kernel@vger.kernel.org (open list)
Cc:     zhengkui_guo@outlook.com, Guo Zhengkui <guozhengkui@vivo.com>
Subject: [PATCH] RDMA: replace ternary operator with min()
Date:   Thu, 12 May 2022 21:58:37 +0800
Message-Id: <20220512135837.41089-1-guozhengkui@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rOlp/cMOlvuKogkOgs9Cgjk3R19AgbXUK/TP6pyoG4cSr8i+WrvF67KmV4GA?=
 =?us-ascii?Q?Lmui44cynSEa9ieTYI9D1U9O0KSREKeqmN2dWB4thCLlx2QzbE2nffb1YBKQ?=
 =?us-ascii?Q?6IekGQBlMPDek69aTK4t57shMbwAe6PplilabxZSSnU1Sr0jem9gWJgRzFE5?=
 =?us-ascii?Q?jFW5fxVHOos9xrmBQaHf5TMq6YhtOMOuYinQmDhpTLE0ywgkLihrDq3HAkbc?=
 =?us-ascii?Q?HI2/l3Fxwos/ABGpXa02089cbbRLk97DHo3YKAi4HrsiPYCeGylBTUIvKfl/?=
 =?us-ascii?Q?f/5i7zMboR7y9pkgMHY2I/Fgt8y9xOWdAfb+b3dmTYQ8NZCkA437x7viZanb?=
 =?us-ascii?Q?tVS9kslSd5eKzgajCOCWJzJ+5Ytf8GlpH4uuLjHanEER/V7OvX9NtMR7Bnrb?=
 =?us-ascii?Q?tPZ9GxE9a2EjxUQLC4SPetEXx4DcKiusbm6Gyul9F3Vd5M/PJ+g+2Ns+B970?=
 =?us-ascii?Q?tpk431KZNil+uh8M82jUmrxxizfM8GH4+L/HuUL5AOcpgQ+eRJn4u9WR9ubD?=
 =?us-ascii?Q?IKhvgQA9eI/mhb+XS8ikssshE0YBfi+83tenuqnKcOJAszyelATHbVV9wg94?=
 =?us-ascii?Q?T6sg1lTyLObL0IWh0jXD5WtZOAMJYAdGFmnjBQswR6IUgANVtkeWVgifptT/?=
 =?us-ascii?Q?6Qa0IbskRIPcq99EFUCn8JVkkJZ//bot5J3nikzkXtzeYSdi+a7n32/KYJ59?=
 =?us-ascii?Q?P9XAH7UWu4RdbkRAWGxMwcXg5KBmNBMNn6C5BxT2emYOk6p6eo+PTq38ObRb?=
 =?us-ascii?Q?TXCDfj3tbMwEVpi20b/WnLWZwlIk9KI0+hINDn2wpc+EVQwbEkCxQ0SluUKh?=
 =?us-ascii?Q?BV/Vwr9pAOripfKSPlMlPLTNiAVrdCZl6AI7HVvv6yrFVh/uUjA+wFDbDB6T?=
 =?us-ascii?Q?fgB6pjkKAST8t6QofdIortnDr1hrlUWEz/8OtQGSQXB2di90w5nBsx6X3amP?=
 =?us-ascii?Q?Un5Rv78vugZaS6o579BikAiR514or0k9QZSA8tYgOoOwuq9B/gTK+QIeR+1E?=
 =?us-ascii?Q?/dM1XopC9P/oTZBTxRX4vdt02QcwUjoqFjDKIzR9OB7BZTPMqyaHxqs3K5h0?=
 =?us-ascii?Q?Ndz65c/7W2fCUJe9teWD3aCOoGg4YeGorPhdsdhGGc35D44i37v3WoTFD8iy?=
 =?us-ascii?Q?tnmfKPTpLkzMOO0Jxus8E8plIgCgan9nJanHdED76gfCULPt++DBnvo26d5B?=
 =?us-ascii?Q?2QFChYUaiPqpRx4UMYygJh38cZME9gLXFs+JUcp3aTD9tspZjZWaqDCAtw9p?=
 =?us-ascii?Q?GleIKbwAec+D8DAEQDW/XJvDhLx1sCVJhk1O//OHOg3d42I2baWOzxN2JCkW?=
 =?us-ascii?Q?5gcIFrJYhiIQLPNdFUcETSOTa26L5iQKgPoOj1xlPeDVBBm08MgNfSw1ZZ17?=
 =?us-ascii?Q?FZ1AQq89tcP5WUDlOuNQx6DYxv+VC72fnCbKXuJwcJasUag1/7eayTLBKi/5?=
 =?us-ascii?Q?kXQMdZws+5jbg/B4H80os15UoBcVHTzYAVIDUL1nudGloSh/oZjdFErrcj4t?=
 =?us-ascii?Q?JF6NaKzsRCo0wyPVgVP1jIZKxXWGiBV3FcrNWV6HFuhP1Qk3gU0REyubpJpJ?=
 =?us-ascii?Q?IIA8ha6050zCepknKaTNbK3+d9VRPsIaNqkTFuRBmDd5NgH2ILyoL99By30H?=
 =?us-ascii?Q?zS5F/OQIkD5XK6QsIW0eGgVgO5w6pp21djIYNqzDF/Sfq/HDev5bRIqMOJJ/?=
 =?us-ascii?Q?7+cHVhovWPCiWBqD74SZEDJAiGVcFFzNLn9DYe3pbAZCLgUNCRcCQ8AfdlLP?=
 =?us-ascii?Q?b6N1Vto75Q=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fb587a97-8077-4cb3-5e09-08da341f9251
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 13:59:03.1189
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Q/yeqwXVrO9jVuJRW0161pDAK/hSYAH2s2HrGJQiGQEpbKyw2tVmLUWRcMj7i9S2qnMiAJILxMOfVs4X/P2BaA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5134
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fix the following coccicheck warnings:

drivers/infiniband/sw/siw/siw_cm.c:1326:11-12: WARNING opportunity for min()
drivers/infiniband/sw/siw/siw_cm.c:488:11-12: WARNING opportunity for min()
drivers/infiniband/hw/cxgb4/cm.c:217:14-15: WARNING opportunity for min()
drivers/infiniband/hw/cxgb4/cm.c:232:14-15: WARNING opportunity for min()

min() macro is defined in include/linux/minmax.h. It avoids multiple
evaluations of the arguments when non-constant and performs strict
type-checking.

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/infiniband/hw/cxgb4/cm.c   | 4 ++--
 drivers/infiniband/sw/siw/siw_cm.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index c16017f6e8db..167faa358800 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -214,7 +214,7 @@ static int c4iw_l2t_send(struct c4iw_rdev *rdev, struct sk_buff *skb,
 		kfree_skb(skb);
 	else if (error == NET_XMIT_DROP)
 		return -ENOMEM;
-	return error < 0 ? error : 0;
+	return min(error, 0);
 }
 
 int c4iw_ofld_send(struct c4iw_rdev *rdev, struct sk_buff *skb)
@@ -229,7 +229,7 @@ int c4iw_ofld_send(struct c4iw_rdev *rdev, struct sk_buff *skb)
 	error = cxgb4_ofld_send(rdev->lldi.ports[0], skb);
 	if (error < 0)
 		kfree_skb(skb);
-	return error < 0 ? error : 0;
+	return min(error, 0);
 }
 
 static void release_tid(struct c4iw_rdev *rdev, u32 hwtid, struct sk_buff *skb)
diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 17f34d584cd9..3f8181664050 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -485,7 +485,7 @@ static int siw_send_mpareqrep(struct siw_cep *cep, const void *pdata, u8 pd_len)
 
 	rv = kernel_sendmsg(s, &msg, iov, iovec_num + 1, mpa_len);
 
-	return rv < 0 ? rv : 0;
+	return min(rv, 0);
 }
 
 /*
@@ -1324,7 +1324,7 @@ static int kernel_bindconnect(struct socket *s, struct sockaddr *laddr,
 
 	rv = s->ops->connect(s, raddr, size, flags);
 
-	return rv < 0 ? rv : 0;
+	return min(rv, 0);
 }
 
 int siw_connect(struct iw_cm_id *id, struct iw_cm_conn_param *params)
-- 
2.20.1