From patchwork Fri Oct 28 18:39:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emily Peri X-Patchwork-Id: 12516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp986946wru; Fri, 28 Oct 2022 11:45:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7BKd2g6un50U98NCkzSnTu3oN6V3/E7Ik/1FC8TgPxkw4gFnoXvZIJ1gHCiuKAS2DVdyMj X-Received: by 2002:a05:6402:516e:b0:461:ebe2:f17d with SMTP id d14-20020a056402516e00b00461ebe2f17dmr792733ede.181.1666982738207; Fri, 28 Oct 2022 11:45:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666982738; cv=none; d=google.com; s=arc-20160816; b=NBfi9xwXUJyVvsSNx6kEQY3EApfAamJf9HqsXR2oTwe9DOBBMgaze6pVXxIV+BGVtu /EnOUG/F/vH4GeIH1yBFphgPjZ8Jk6+V1xnlnjiW6vN070i0v5zq6zUb5zPVyapQmay1 3icH1+io6s7wMpCNmwYebavJbSfVZGSp4CV4qJw8iVdphVTpnlfHeUdlx18qZaua4Jr5 q7h1vlLqLjyJV2z9Hw4OghtJLlHj7Krod+uwzynCZWQGZirgSGMZNMbPW+MS5CUPKAOd FcRHFnmdqMZ+A5Ypz1uvFaAx06xsaNjabx6mv8V2uCtjaeoTNfBO6HQZByE4ckwaEOvP gfZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:to:from:date:dkim-signature; bh=Ds8fIMyaNA48AptZtnD7lRg8k6tUlPBhxOTWMASKHUs=; b=Z6J7wT0owfZUeNM35fWR2wqylvGvlTL9aDQ7TGb/ulQKT3HYw8wkhL4w+8IoXDBPUU zIfmTTtE0/8thAsnaIH13Z0avwWLdCC2N+w34k9c8ATcglc+CLeyKk1gEcKMh4Oahg0o k7g2cpkFNtw96ul7vGKwBicTXzX81uBqqnWtgC7s2e0kKVvDSN7Ie5Ckt36oB26OS6AN CIHHDmFkt1BSPTZ1hQu1ucUYuXJsqAFP1MstZwlVD4FLdvjgBrzoTIq6i4ZeCJOuFdew ryWkZl9TVbynCCqmR1V99kXuHQAli/CHqTsRut51SGScdqUSfFiOIsgBDqVf39Md7fne lugg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lUEI5WN7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w1-20020a056402268100b004612505ece4si6526231edd.483.2022.10.28.11.45.14; Fri, 28 Oct 2022 11:45:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lUEI5WN7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230003AbiJ1Sjb (ORCPT + 99 others); Fri, 28 Oct 2022 14:39:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbiJ1Sj3 (ORCPT ); Fri, 28 Oct 2022 14:39:29 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1913D244701 for ; Fri, 28 Oct 2022 11:39:24 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id r61-20020a17090a43c300b00212f4e9cccdso10608909pjg.5 for ; Fri, 28 Oct 2022 11:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=Ds8fIMyaNA48AptZtnD7lRg8k6tUlPBhxOTWMASKHUs=; b=lUEI5WN7vVAo0vJruFg2Ec2nTRmNeG7C630IN0qUPxyNQRHjk0JBpAF5gnfd1IEpn5 +rT3YPCjISfTgbLpN4UpbGjFzTzK2KsPGhepkTYDrz8iPCu/Sada01cZ0kroNyLiXsqR Qor3Zlynf1oZbwN8Lkxr2X9uUODEKHq5dr4f8uRHnQmTL/EfUqOwGLFM8oamFLVo7kmR DynpwoxQ8hWCxSCN9xBP2tRmQcqBImZ9Ka6wFE/tkWvyebxTwx5TOVEAS1oYvGNvAGlP dKWujbm9NERzYXf4FFkksQl24S4hsi9hEw8h7dvyLhs/AgbrqCKE9V3AkNjQubZMkk8E EGCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ds8fIMyaNA48AptZtnD7lRg8k6tUlPBhxOTWMASKHUs=; b=2rjTCw6UEc+a2A8LI7IdSNSYRtVo9RDb+Ew/abnim2puSeUr77zQgnW830+1J+WQ+e uK6yBdRkoPfwVG2Xfx+Imf/tAhs/Xz7f3J4s9aA4Mv7PRnRscW/B9DQZwWbBLziGwD0e +TPaYBhNuer8KDNXUqqgfBSvvDNENUv1bGoGq3bR1Llq2rUKsvdS/zYV/W0EXS2tw4P2 XojMOUiYIQxt6nBVpirH7rCKpT1PJBa7Q3A/FmjXxn5oKGT8MR4QWcUOuyNEuNrQ5Ccd I+/pE2KpJmDaCbLCRZe4pFRnnK4Cl+0sdgVQ7ok22XnMw3BJoRUCfxVOfh0ZFOV826gy as4A== X-Gm-Message-State: ACrzQf1hrHTh+kcLmjdvGnjxme0zUYNDOTT2lImBjLWzTZABPAhpVaZk 5HOpFFnA0sVDqxmjKnLqcHo2AhB0nSbFcg== X-Received: by 2002:a17:903:41c7:b0:182:a32f:4db5 with SMTP id u7-20020a17090341c700b00182a32f4db5mr389153ple.22.1666982363604; Fri, 28 Oct 2022 11:39:23 -0700 (PDT) Received: from marshmallow (192-184-163-51.fiber.dynamic.sonic.net. [192.184.163.51]) by smtp.gmail.com with ESMTPSA id b12-20020a170903228c00b0018696c5d61esm3418137plh.151.2022.10.28.11.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 11:39:22 -0700 (PDT) Date: Fri, 28 Oct 2022 11:39:19 -0700 From: Emily Peri To: gregkh@linuxfoundation.org, outreachy@lists.linux.dev, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2] staging: rtl8723bs: replace ternary statement with min_t macro Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747958091713866544?= X-GMAIL-MSGID: =?utf-8?q?1747958091713866544?= Ternary statements that pick the min of two values can be replaced by the macro min_t(). This improves readability, since its quicker to understand min_t(type, x, y) than x < y ? x : y. Issue found by coccicheck. Signed-off-by: Emily Peri --- Changes in v2: - Use min_t() intead of min(). Feedback from Dan Carpenter. --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index 6aeb169c6ebf..54004f846cf0 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1551,7 +1551,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel wps_ie = rtw_get_wps_ie(buf, ielen, NULL, &wps_ielen); if (wps_ie && wps_ielen > 0) { - padapter->securitypriv.wps_ie_len = wps_ielen < MAX_WPS_IE_LEN ? wps_ielen : MAX_WPS_IE_LEN; + padapter->securitypriv.wps_ie_len = min_t(uint, wps_ielen, MAX_WPS_IE_LEN); memcpy(padapter->securitypriv.wps_ie, wps_ie, padapter->securitypriv.wps_ie_len); set_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS); } else {