From nobody Fri Jun 19 10:45:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DA32C433F5 for ; Tue, 5 Apr 2022 06:08:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbiDEGKd (ORCPT ); Tue, 5 Apr 2022 02:10:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbiDEGKU (ORCPT ); Tue, 5 Apr 2022 02:10:20 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D96C13FB0 for ; Mon, 4 Apr 2022 23:08:22 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id p23so6082535edi.8 for ; Mon, 04 Apr 2022 23:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fu7aqeJdvRBKy6QUBPM9ZuIG13sfzEk0Yx9f/9oe+ik=; b=PNr98mEAV+ZJz2/y6HuykyZiTsQITMPhjSEYPEzPAAKqBPxyD+4UJbZ3iskl5B7eTo jEZKTd+lPt1q8jruNDR0atk1Nu9BGQEIdUB/fMRFLRM6bHNjhK9RnQhLdKHlGYYXyPPc rrDMD2OJ0Y5MdOePeCdwKRsasYHA6nRBc0HbcRJDfCDnRGnORUxtJ1BEqsk9e/pd6jjy nrcWvcVml6QOu2dFngziQr+teOyjSkJOD4UvhIszEkMQsQVO+4qgaIS+EE0LVsat/l+e GFIz9yoqQd7NfVM1068hhzA43PHPyM6Ix8BHp/LSOfTG4BlIDQS9iG5sO2qWeH5TO32K eyjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fu7aqeJdvRBKy6QUBPM9ZuIG13sfzEk0Yx9f/9oe+ik=; b=1yL7Ml/asa7hylH9N7/GqyOSzjvA+df8UI6ugjvkpQaWiyU0GPAGew/2sf8ogHXPvP RSXqLF07NR+DYDbl0+DRCs/a8vSMcaZ7Gto0yZg5HB7Ut/RFB3aRtqUkcAxu7GPw5zIb nhKpEZS18t/dd/hwwhu3Zr5ZDZ2/sI32+w6HNBsWmEg1LrDHq+CpuYjHzC8Y+gEvizG8 7WpTuWKkOpA8P/tbAv9q90bVUxxoC1PQbdogwxLDbqk2PUzlpkuO4qytlBDsakv1jL8Z aCO/EGCce04oKx7bNh7DU+24L33AmRxaZ0Ry9UtpYf/GcC7N/CrdYf8NitrMUtrEs2H8 QPoQ== X-Gm-Message-State: AOAM5336WxUKfzNGQV+A6FbUPu2y5cK2OFAjU4eDJyYPWPpRdNnyWUEV GK8vpWBD5QHTwEjTt8IlP+g= X-Google-Smtp-Source: ABdhPJyBAD2xvlb10t5lZcC/yT22TrwyDfWlctDkP4Z4vzZDaorZdOp8sBKVZ8NsTld2MziWLMrXvA== X-Received: by 2002:a05:6402:d0e:b0:418:f011:275e with SMTP id eb14-20020a0564020d0e00b00418f011275emr1813470edb.323.1649138900727; Mon, 04 Apr 2022 23:08:20 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id h5-20020a170906718500b006e7edcda732sm2484538ejk.125.2022.04.04.23.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 23:08:20 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 1/2] staging: r8188eu: remove unncessary ternary operator Date: Tue, 5 Apr 2022 08:08:12 +0200 Message-Id: <20220405060813.8448-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405060813.8448-1-straube.linux@gmail.com> References: <20220405060813.8448-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are some uses of ternary operator where it explicitly sets true or false but the condition already evaluates to true or false. In this cases the ternary operator is redundant and can be removed. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_p2p.c | 2 +- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 4 ++-- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 4 ++-- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/hal_com.c | 2 +- drivers/staging/r8188eu/hal/odm_HWConfig.c | 4 ++-- drivers/staging/r8188eu/include/HalVerDef.h | 4 ++-- drivers/staging/r8188eu/os_dep/osdep_service.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188= eu/core/rtw_p2p.c index 1e728a03e0ac..80305d128ccd 100644 --- a/drivers/staging/r8188eu/core/rtw_p2p.c +++ b/drivers/staging/r8188eu/core/rtw_p2p.c @@ -951,7 +951,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwd= info, u8 *pframe, uint le /* issue Device Discoverability Response */ issue_p2p_devdisc_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken); =20 - return (status =3D=3D P2P_STATUS_SUCCESS) ? true : false; + return status =3D=3D P2P_STATUS_SUCCESS; } =20 u32 process_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe, = uint len) diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r= 8188eu/core/rtw_pwrctrl.c index 5d468e8b4920..4537b51ff8bc 100644 --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c @@ -348,7 +348,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) =20 pwrctrlpriv->LpsIdleCount =3D 0; pwrctrlpriv->power_mgnt =3D padapter->registrypriv.power_mgnt;/* PS_MODE= _MIN; */ - pwrctrlpriv->bLeisurePs =3D (PS_MODE_ACTIVE !=3D pwrctrlpriv->power_mgnt)= ? true : false; + pwrctrlpriv->bLeisurePs =3D PS_MODE_ACTIVE !=3D pwrctrlpriv->power_mgnt; =20 pwrctrlpriv->bFwCurrentInPSMode =3D false; =20 @@ -424,7 +424,7 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode) else pwrctrlpriv->LpsIdleCount =3D 2; pwrctrlpriv->power_mgnt =3D mode; - pwrctrlpriv->bLeisurePs =3D (PS_MODE_ACTIVE !=3D pwrctrlpriv->power_mgn= t) ? true : false; + pwrctrlpriv->bLeisurePs =3D PS_MODE_ACTIVE !=3D pwrctrlpriv->power_mgnt; } } else { ret =3D -EINVAL; diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index 91ff82f24f1f..357f98e22d8a 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -470,9 +470,9 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_ad= dr) spin_unlock_bh(&pacl_node_q->lock); =20 if (pacl_list->mode =3D=3D 1)/* accept unless in deny list */ - res =3D (match) ? false : true; + res =3D !match; else if (pacl_list->mode =3D=3D 2)/* deny unless in accept list */ - res =3D (match) ? true : false; + res =3D match; else res =3D true; =20 diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index b526715a70bc..84ced6a86df9 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1482,7 +1482,7 @@ void process_addba_req(struct adapter *padapter, u8 *= paddba_req, u8 *addr) tid =3D (param >> 2) & 0x0f; preorder_ctrl =3D &psta->recvreorder_ctrl[tid]; preorder_ctrl->indicate_seq =3D 0xffff; - preorder_ctrl->enable =3D (pmlmeinfo->bAcceptAddbaReq) ? true : false; + preorder_ctrl->enable =3D pmlmeinfo->bAcceptAddbaReq; } } =20 diff --git a/drivers/staging/r8188eu/hal/hal_com.c b/drivers/staging/r8188e= u/hal/hal_com.c index 06f2a9083056..7649f9919f67 100644 --- a/drivers/staging/r8188eu/hal/hal_com.c +++ b/drivers/staging/r8188eu/hal/hal_com.c @@ -267,7 +267,7 @@ static void three_out_pipe(struct adapter *adapter, boo= l wifi_cfg) bool Hal_MappingOutPipe(struct adapter *adapter, u8 numoutpipe) { struct registry_priv *pregistrypriv =3D &adapter->registrypriv; - bool wifi_cfg =3D (pregistrypriv->wifi_spec) ? true : false; + bool wifi_cfg =3D pregistrypriv->wifi_spec; bool result =3D true; =20 switch (numoutpipe) { diff --git a/drivers/staging/r8188eu/hal/odm_HWConfig.c b/drivers/staging/r= 8188eu/hal/odm_HWConfig.c index 1183e4a522c0..54cc3d7789cd 100644 --- a/drivers/staging/r8188eu/hal/odm_HWConfig.c +++ b/drivers/staging/r8188eu/hal/odm_HWConfig.c @@ -65,7 +65,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_d= m_struct *dm_odm, =20 struct phy_status_rpt *pPhyStaRpt =3D (struct phy_status_rpt *)pPhyStatus; =20 - isCCKrate =3D ((pPktinfo->Rate >=3D DESC92C_RATE1M) && (pPktinfo->Rate <= =3D DESC92C_RATE11M)) ? true : false; + isCCKrate =3D pPktinfo->Rate >=3D DESC92C_RATE1M && pPktinfo->Rate <=3D D= ESC92C_RATE11M; =20 if (isCCKrate) { u8 cck_agc_rpt; @@ -234,7 +234,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct = *dm_odm, if ((!pPktinfo->bPacketMatchBSSID)) return; =20 - isCCKrate =3D ((pPktinfo->Rate >=3D DESC92C_RATE1M) && (pPktinfo->Rate <= =3D DESC92C_RATE11M)) ? true : false; + isCCKrate =3D pPktinfo->Rate >=3D DESC92C_RATE1M && pPktinfo->Rate <=3D D= ESC92C_RATE11M; =20 /* Smart Antenna Debug Message------------------ */ if ((dm_odm->AntDivType =3D=3D CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType = =3D=3D CGCS_RX_HW_ANTDIV)) { diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/= r8188eu/include/HalVerDef.h index 2bc18eabb55d..56dadadb1a0f 100644 --- a/drivers/staging/r8188eu/include/HalVerDef.h +++ b/drivers/staging/r8188eu/include/HalVerDef.h @@ -34,10 +34,10 @@ struct HAL_VERSION { =20 /* HAL_CHIP_TYPE_E */ #define IS_NORMAL_CHIP(version) \ - ((GET_CVID_CHIP_TYPE(version) =3D=3D NORMAL_CHIP) ? true : false) + (GET_CVID_CHIP_TYPE(version) =3D=3D NORMAL_CHIP) =20 /* HAL_VENDOR_E */ #define IS_CHIP_VENDOR_TSMC(version) \ - ((GET_CVID_MANUFACTUER(version) =3D=3D CHIP_VENDOR_TSMC) ? true : false) + (GET_CVID_MANUFACTUER(version) =3D=3D CHIP_VENDOR_TSMC) =20 #endif diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/stagi= ng/r8188eu/os_dep/osdep_service.c index fc10eefe04a9..6824a6ab2e36 100644 --- a/drivers/staging/r8188eu/os_dep/osdep_service.c +++ b/drivers/staging/r8188eu/os_dep/osdep_service.c @@ -211,7 +211,7 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u3= 2 src_len) */ inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf) { - return (cbuf->write =3D=3D cbuf->read) ? true : false; + return cbuf->write =3D=3D cbuf->read; } =20 /** --=20 2.35.1 From nobody Fri Jun 19 10:45:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0BACC433F5 for ; Tue, 5 Apr 2022 06:08:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230090AbiDEGKj (ORCPT ); Tue, 5 Apr 2022 02:10:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbiDEGKU (ORCPT ); Tue, 5 Apr 2022 02:10:20 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C27C01400B for ; Mon, 4 Apr 2022 23:08:22 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id g22so13656536edz.2 for ; Mon, 04 Apr 2022 23:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9ROXeEvSzaQep2rue/UuQgAQJtln4/qs41ov5tBhK2c=; b=IoKqbMUmgOcq6YZ+qyzSLZ1zRJ4ZOpCqXIjOsZeiYJ0/+uSQDxHkpq4eRlwGEk5Nt4 0QjqSj1tt63etbj+st4KwiFTPbSw0vLmHDD43sSiFEbs7Xxu5igzMIW4bNAhrnwSUj0+ tbJY75oj22Z0KDNXSnCGyirRJrB23GoyZnuQKMLVeC2W9OuxWi3YljtHxrCrDM3vPe2u A6sa3od8nPqiKpuAHMd2wC7LV5qM59qmka5Djqgx1RXhh2hRPyOclGQYqPVmaQJd7+eJ yMDR7HPu386E98XkxjqeGn/qehEANyP/5nv5aOB7NqwZc3DpTyUPJjLrS+ZDmH4Spg8p 0vdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ROXeEvSzaQep2rue/UuQgAQJtln4/qs41ov5tBhK2c=; b=RWhEk1sSwaBN9OzXMmUU8TjwR1g6OpykXT5uYuBIowZg/muEhlnSzBGEpBVcwPneLD uLRwQWuZ/oyRJjp8Y2RBuum2MweVg8So8LZx31+BxpB56ueL6aPvor2dO7RmHQSrUVMZ t1fp1ZBcDk83EQbpjlUsDLuEZLr8JI+jD9rDi5GYBoE6KdywLyKekD45y0Eb8C9Oav9V FV/KgdXz8o7Iay8HesYqhw6420W1k+x9S+yw9WOUGicn5JozIK5ARHLl0kPwFBCZzM8V NPYhueCK4My1FxkPF8fcLWLsZBIq60R6Q5bkgUP9/Xjsx1Med4DFsvL+A3HipFW2NH2W zkMw== X-Gm-Message-State: AOAM5311+BcRRC9e+hHTerIp8eM7iBqvJHVnNYPOa6oBnEr7IRmE/3NQ H+e2h/eZkwQn8GZZuscF4ZY= X-Google-Smtp-Source: ABdhPJycyQMuNsQT2VEkK5hILonrxPniN2o0a6T3GkmK+k1ebpycGq9Nkackc1KmS2EKNnmXeZwtaw== X-Received: by 2002:a05:6402:1541:b0:41c:bfb9:d56b with SMTP id p1-20020a056402154100b0041cbfb9d56bmr1860176edx.344.1649138901381; Mon, 04 Apr 2022 23:08:21 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id h5-20020a170906718500b006e7edcda732sm2484538ejk.125.2022.04.04.23.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 23:08:21 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 2/2] staging: r8188eu: remove unused macros from ieee80211.h Date: Tue, 5 Apr 2022 08:08:13 +0200 Message-Id: <20220405060813.8448-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405060813.8448-1-straube.linux@gmail.com> References: <20220405060813.8448-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unused macros from ieee80211.h. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/ieee80211.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/= r8188eu/include/ieee80211.h index 8c20363cdd31..bf4ce3cba46f 100644 --- a/drivers/staging/r8188eu/include/ieee80211.h +++ b/drivers/staging/r8188eu/include/ieee80211.h @@ -123,24 +123,6 @@ enum NETWORK_TYPE { WIRELESS_11BG_24N =3D (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N), }; =20 -#define SUPPORTED_24G_NETTYPE_MSK \ - (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N) - -#define IsSupported24G(NetType) \ - ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false) - -#define IsEnableHWCCK(NetType) \ - IsSupported24G(NetType) - -#define IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType) - -#define IsSupportedTxCCK(NetType) \ - ((NetType) & (WIRELESS_11B) ? true : false) -#define IsSupportedTxOFDM(NetType) \ - ((NetType) & (WIRELESS_11G) ? true : false) -#define IsSupportedTxMCS(NetType) \ - ((NetType) & (WIRELESS_11_24N) ? true : false) - struct ieee_param { u32 cmd; u8 sta_addr[ETH_ALEN]; --=20 2.35.1