From nobody Fri Jun 26 16:43:39 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 E96FFC433EF for ; Mon, 21 Feb 2022 07:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243870AbiBUHeQ (ORCPT ); Mon, 21 Feb 2022 02:34:16 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:50938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346257AbiBUHdy (ORCPT ); Mon, 21 Feb 2022 02:33:54 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98B1A659F for ; Sun, 20 Feb 2022 23:33:17 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id bq11so6091898edb.2 for ; Sun, 20 Feb 2022 23:33:17 -0800 (PST) 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=GygaqrnptWbGRKfUQnwAPPKWiQdpM61jTZJHob6nbtc=; b=a4vK4Slurn80v0GcEbZhj3E5dz1U+rEx6E9kOq1YgwC2RFddMjCemcnRU+xDhb68Z9 2z1ryStDhoth611iAu2B39GjnRTdXwae2s/AXvy6aWgvUvHSOaHpKxSYimMroktBwQ7T BvJxv3acdVLg1R0ZkYyF8VEJX/wb8A/ToVef9m6dy3LYCr8/yeYljF4m7MdzRVYMJ2lK Vx6FcvL2t+LFMTaAWk2CznV4A5VbjxesXt7DH17snKETnmq0/Mcbwecm5tBhyHTeZx/m GneFqOkYDZ8/MNNVD1E6Fi1V8C6huExLTnymM+baErXjrPcbkSPnDW7EZ1vFZtLhOV06 Zl3g== 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=GygaqrnptWbGRKfUQnwAPPKWiQdpM61jTZJHob6nbtc=; b=JhOzlgxd9e5v3/p9CNpskDZOOSudc7W9hEEtcIgv5sqlP3RAiLrrW4G8BnicIIxBrn L6+5kWkkbGx/XWIuPe0hwulS5grM9NnM9M63YRJfOt9AJP1pMsu31TKXfvFXiSAJriZB 33W3DoKHyCYUoN8jRB5hHYbgSmxBkC8vmOZKE6EP6RZqPk01ZVIqfL/3JUoF4Dlvx/4v wKlEl26fdv66jz1riU1B3eAXROqx92XB8J6a9iNj2eRMG4bVtyInVAKX+80RwGqIey+H 9xsuTAtuqGgf1u3Tqea+aRH8uG/+BJDSiUeNLOJeNi93174MWM/LwlhsYHAlwroyqLMd abdg== X-Gm-Message-State: AOAM531cDpmd8Ep/ix3Pqhu8FgbnNkXh+N6TzLVHTMWIOp4q62OzUS9R zNIOPNk7+Vds3gNJbvHbBfU= X-Google-Smtp-Source: ABdhPJxjql3GmCyCpnZqwfYhPqgIJzQIhr6UBSwPupEjDAJc8LihhbWXT8uxgjsQbfeVRmKd2vkDYA== X-Received: by 2002:a05:6402:168e:b0:410:d2a4:b0dd with SMTP id a14-20020a056402168e00b00410d2a4b0ddmr19744492edv.403.1645428796050; Sun, 20 Feb 2022 23:33:16 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id c11sm8673128edx.42.2022.02.20.23.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 23:33:15 -0800 (PST) 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/5] staging: r8188eu: remove ODM_CmnInfoHook() Date: Mon, 21 Feb 2022 08:33:02 +0100 Message-Id: <20220221073306.16636-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221073306.16636-1-straube.linux@gmail.com> References: <20220221073306.16636-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" Each case in ODM_CmnInfoHook() just sets a single variable. Set the variables directly and remove ODM_CmnInfoHook(). Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/hal/odm.c | 31 ----------------------- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 13 +++++----- drivers/staging/r8188eu/include/odm.h | 14 ---------- 3 files changed, 7 insertions(+), 51 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index e0824eefd83a..6f594ae33c6e 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -639,37 +639,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, en= um odm_common_info_def Cmn pDM_Odm->BbSwingFlagOfdm =3D false; } =20 -void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm, enum odm_common_info_d= ef CmnInfo, void *pValue) -{ - /* */ - /* Hook call by reference pointer. */ - /* */ - switch (CmnInfo) { - /* Dynamic call by reference pointer. */ - case ODM_CMNINFO_WM_MODE: - pDM_Odm->pWirelessMode =3D (u8 *)pValue; - break; - case ODM_CMNINFO_SEC_CHNL_OFFSET: - pDM_Odm->pSecChOffset =3D (u8 *)pValue; - break; - case ODM_CMNINFO_BW: - pDM_Odm->pBandWidth =3D (u8 *)pValue; - break; - case ODM_CMNINFO_CHNL: - pDM_Odm->pChannel =3D (u8 *)pValue; - break; - case ODM_CMNINFO_SCAN: - pDM_Odm->pbScanInProcess =3D (bool *)pValue; - break; - case ODM_CMNINFO_POWER_SAVING: - pDM_Odm->pbPowerSaving =3D (bool *)pValue; - break; - default: - /* do nothing */ - break; - } -} - /* Update Band/CHannel/.. The values are dynamic but non-per-packet. */ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Val= ue) { diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index a05d8687c18d..09e78c4855f9 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -38,12 +38,13 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adap= ter) =20 ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag); =20 - ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_WM_MODE, &pmlmeext->cur_wireless_mode= ); - ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SEC_CHNL_OFFSET, &hal_data->nCur40Mhz= PrimeSC); - ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_BW, &hal_data->CurrentChannelBW); - ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_CHNL, &hal_data->CurrentChannel); - ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess); - ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_POWER_SAVING, &pwrctrlpriv->bpower_sa= ving); + dm_odm->pWirelessMode =3D &pmlmeext->cur_wireless_mode; + dm_odm->pSecChOffset =3D &hal_data->nCur40MhzPrimeSC; + dm_odm->pBandWidth =3D (u8 *)&hal_data->CurrentChannelBW; + dm_odm->pChannel =3D &hal_data->CurrentChannel; + dm_odm->pbScanInProcess =3D (bool *)&pmlmepriv->bScanInProcess; + dm_odm->pbPowerSaving =3D (bool *)&pwrctrlpriv->bpower_saving; + ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivT= ype); =20 for (i =3D 0; i < NUM_STA; i++) diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 9fb09e0a0df9..0e85bd88ab8a 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -126,17 +126,6 @@ enum odm_common_info_def { ODM_CMNINFO_MP_TEST_CHIP, /* HOOK BEFORE REG INIT----------- */ =20 - /* Dynamic value: */ -/* POINTER REFERENCE----------- */ - ODM_CMNINFO_WM_MODE, /* ODM_WIRELESS_MODE_E */ - ODM_CMNINFO_SEC_CHNL_OFFSET, /* ODM_SEC_CHNL_OFFSET_E */ - ODM_CMNINFO_BW, /* ODM_BW_E */ - ODM_CMNINFO_CHNL, - - ODM_CMNINFO_SCAN, - ODM_CMNINFO_POWER_SAVING, -/* POINTER REFERENCE----------- */ - /* CALL BY VALUE------------- */ ODM_CMNINFO_LINK, ODM_CMNINFO_RSSI_MIN, @@ -472,9 +461,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm); void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def CmnInfo, u32 Value); =20 -void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm, - enum odm_common_info_def CmnInfo, void *pValue); - void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Val= ue); =20 #endif --=20 2.35.1 From nobody Fri Jun 26 16:43:39 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 6CE78C433F5 for ; Mon, 21 Feb 2022 07:33:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346226AbiBUHeK (ORCPT ); Mon, 21 Feb 2022 02:34:10 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:51586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346326AbiBUHdz (ORCPT ); Mon, 21 Feb 2022 02:33:55 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98C6913EAE for ; Sun, 20 Feb 2022 23:33:18 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a8so30880381ejc.8 for ; Sun, 20 Feb 2022 23:33:17 -0800 (PST) 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=LmobdHxkxm4sdZUtfeeL0jQWyBgw3L2XhUOirp2Pdv8=; b=JFK//iev0pBvNj0CFQ9+b4BEWenMAl8usHqaW23BHSYyZtw9W/X7F/NKjK+fyHz/6n qEUzb1v+9BsdAXdg2zQSHBXGVy0lObGc/bLnYXNi5sBEA6g3IzTHkrnOe++R/CzL/49y 7aUC6ci5LMzdG13gm3mWL43W39ZcoX1eSDD32wIKSCsq6w45oi8tDNfj2c5B5sVqbnGz 4bk7Svz3Jy2GQvlkvtFnQi43WrBR5wx36uNA9F937H6lNsmO9WJaSjbYZx6VXkbts6tX IyhN6BdqKDfzTv/RfnvvVVYaddb7Tuy0gJCB3yubDu6m6Op6kUxO6Jk0zFgFrBjuYi1b u97A== 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=LmobdHxkxm4sdZUtfeeL0jQWyBgw3L2XhUOirp2Pdv8=; b=7sK1wCJ9YzFlj0s11gjgt+KP5HcNG426nulXR28k9btdUsVXY40ObRWKhTusxH9Xe0 SHZr8Dv7raXpbwI6LMJMAwP4lIQ5InmyzLFqGV8BjQTSUN3VxqV3aOf0O+hIZOeC1bT/ LytBzXm4HQ1DXoVcTKHdaRjApWTezTYzSl0rgJl/XtlPUkdqxv/bhop+qN4mgdn8nhCi MGvTy3lnr7mFY0CEq6pXeOBhEIwdcwQXBctGi4F66qCXKBXQiyN5Y6R9vkAU62CEaoyD 1DXqfUAKcRJ+VF63nOh9VD8XIRJAfEhB61gTlfb9gRu0J+gMYV3rKsqYsE5IB0Ylh/E1 w8Fg== X-Gm-Message-State: AOAM530NY6jITD5yZ1FFKKxSGRtD3t2C536yiB3i88gGN55q6OWMr251 pDrnJd0I1sHd5Sqrn9eKSIg= X-Google-Smtp-Source: ABdhPJwekhD4/9toUXVwuLkN3p5pIZZr2uNzNF7c7+/+v4nqnQ1e/O3LotKXODnpNJ8mdR+A7sxGXA== X-Received: by 2002:a17:906:37cf:b0:6ce:6321:5ecb with SMTP id o15-20020a17090637cf00b006ce63215ecbmr14897728ejc.385.1645428796658; Sun, 20 Feb 2022 23:33:16 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id c11sm8673128edx.42.2022.02.20.23.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 23:33:16 -0800 (PST) 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/5] staging: r8188eu: convert two u8 variables to bool Date: Mon, 21 Feb 2022 08:33:03 +0100 Message-Id: <20220221073306.16636-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221073306.16636-1-straube.linux@gmail.com> References: <20220221073306.16636-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" The variables bScanInProcess in struct mlme_priv and bpower_saving in struct pwrctrl_priv are both used to store only boolean values true and false. Convert them from u8 to bool to avoid type casts in the function Update_ODM_ComInfo_88E(). Signed-off-by: Michael Straube --- v2: Fixed a typo in the commit message. unsed -> used drivers/staging/r8188eu/hal/rtl8188e_dm.c | 4 ++-- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- drivers/staging/r8188eu/include/rtw_pwrctrl.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 09e78c4855f9..082104c9b2e8 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -42,8 +42,8 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) dm_odm->pSecChOffset =3D &hal_data->nCur40MhzPrimeSC; dm_odm->pBandWidth =3D (u8 *)&hal_data->CurrentChannelBW; dm_odm->pChannel =3D &hal_data->CurrentChannel; - dm_odm->pbScanInProcess =3D (bool *)&pmlmepriv->bScanInProcess; - dm_odm->pbPowerSaving =3D (bool *)&pwrctrlpriv->bpower_saving; + dm_odm->pbScanInProcess =3D &pmlmepriv->bScanInProcess; + dm_odm->pbPowerSaving =3D &pwrctrlpriv->bpower_saving; =20 ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_RF_ANTENNA_TYPE, hal_data->TRxAntDivT= ype); =20 diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 1e16fa615b94..d418d57f99b6 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -310,7 +310,7 @@ struct qos_priv { struct mlme_priv { spinlock_t lock; int fw_state; /* shall we protect this variable? maybe not necessarily...= */ - u8 bScanInProcess; + bool bScanInProcess; u8 to_join; /* flag */ u8 to_roaming; /* roaming trying times */ =20 diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/stagin= g/r8188eu/include/rtw_pwrctrl.h index 2d5298373d74..7c3cb895c3cd 100644 --- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h +++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h @@ -49,7 +49,7 @@ struct pwrctrl_priv { =20 u32 alives; struct work_struct cpwm_event; - u8 bpower_saving; + bool bpower_saving; =20 u8 reg_rfoff; u8 reg_pdnmode; /* powerdown mode */ --=20 2.35.1 From nobody Fri Jun 26 16:43:39 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 AE675C433EF for ; Mon, 21 Feb 2022 07:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346297AbiBUHeV (ORCPT ); Mon, 21 Feb 2022 02:34:21 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:50924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346258AbiBUHdy (ORCPT ); Mon, 21 Feb 2022 02:33:54 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B31E913E82 for ; Sun, 20 Feb 2022 23:33:18 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id d10so30787746eje.10 for ; Sun, 20 Feb 2022 23:33:18 -0800 (PST) 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=O6E3mVixruLxdZHjJ1wxRBvkKpRcoOQJ1soEUthx7X8=; b=gUQMEEqFDEmmcDfzQK4o4ZPd3s+UQuFOc+Zi9aGoY4O9z4ClQqvVxUQKAp84YpPBNy BM+t/PtQ76A2WSBqY3SoOh1ZsaLIfjOqC4TexkXAyjPiJLcyBIp2NsIgEOrV5u4t91MG NXffr3x/r3eBumnMs8Cefeo2RwA/35zjl1ikjnym6ZxGZAgr+lMf5J618Rms6eUX9GFM 3BwDy6Q8AfjVRmv7EiYNcU/CApBEF+Q+G/hCSe1Y0/WsKwIISG9q0bHIwLiZxoPgvElB 4VLmCzRidd1PO53gsCfXp/E4ikpWLwS9b8zQ9X+uz5HsJwqrcGkcf4SAAiztXlI8TuiS J4LA== 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=O6E3mVixruLxdZHjJ1wxRBvkKpRcoOQJ1soEUthx7X8=; b=QCtP8e04r3zb7lGkYusD4L6rq/XysWGyVngn7O9EiqqDh0BQJBj17CJhFG+XHNvKmM z2q/nWsc59OAMXLWmyrSmxNpD3SmEokPQa1qwCsTjQKCdbqpt5XvnMJtLyGoLzFX/BE7 eXSt9NohSX+Gj+On+MXCZ0oxd8zjqtC6fNbfZOMQ5e+XmYJbB7YxrQkmKzZT9Vl0xmE8 +E2ls+rzRv6Rm6TxsBI/Q4MLWIrYf5N5XvDZskk8J03xiGaluVjE6OKcpSMzzXgYVylN wZ08vNLgSXhtiliS1Bbil0m5eC2x3sWOhNcLhwRbwgPgOAe3Ja/7UYrG/rbUbhUNkch1 u4/Q== X-Gm-Message-State: AOAM5301gEp4n0WYXMVczLpMl/sshzpCm6P7OvRis1DzlRwbyD8Rj/6p z7aF/+iKw5NNqjBOyzHD+DY= X-Google-Smtp-Source: ABdhPJxTNUhzfwuSfieA7KUNxbkpK3lwDok77gr9+EbSnDej9/2n495FaAXct4sPOB+LaEklpGVrKw== X-Received: by 2002:a17:906:407:b0:6cd:472b:2d5f with SMTP id d7-20020a170906040700b006cd472b2d5fmr14530079eja.573.1645428797278; Sun, 20 Feb 2022 23:33:17 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id c11sm8673128edx.42.2022.02.20.23.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 23:33:17 -0800 (PST) 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 3/5] staging: r8188eu: remove enum odm_bw Date: Mon, 21 Feb 2022 08:33:04 +0100 Message-Id: <20220221073306.16636-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221073306.16636-1-straube.linux@gmail.com> References: <20220221073306.16636-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" The enums odm_bw and ht_channel_width are redundant. Keep ht_channel_width and remove odm_bw. Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/hal/odm.c | 4 ++-- drivers/staging/r8188eu/include/odm.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 6f594ae33c6e..5d2f934d78ae 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -266,7 +266,7 @@ static void odm_CommonInfoSelfUpdate(struct odm_dm_stru= ct *pDM_Odm) u8 i; struct sta_info *pEntry; =20 - if (*pDM_Odm->pBandWidth =3D=3D ODM_BW40M) { + if (*pDM_Odm->pBandWidth =3D=3D HT_CHANNEL_WIDTH_40) { if (*pDM_Odm->pSecChOffset =3D=3D 1) pDM_Odm->ControlChannel =3D *pDM_Odm->pChannel - 2; else if (*pDM_Odm->pSecChOffset =3D=3D 2) @@ -766,7 +766,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, = u32 macid, u32 ra_mask, u } else if (rssi_level =3D=3D DM_RATR_STA_MIDDLE) { rate_bitmap =3D 0x000ff000; } else { - if (*pDM_Odm->pBandWidth =3D=3D ODM_BW40M) + if (*pDM_Odm->pBandWidth =3D=3D HT_CHANNEL_WIDTH_40) rate_bitmap =3D 0x000ff015; else rate_bitmap =3D 0x000ff005; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 0e85bd88ab8a..fed12203c558 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -166,12 +166,6 @@ enum odm_wireless_mode { ODM_WM_AUTO =3D BIT(5), }; =20 -/* ODM_CMNINFO_BW */ -enum odm_bw { - ODM_BW20M =3D 0, - ODM_BW40M =3D 1, -}; - struct odm_ra_info { u8 RateID; u32 RateMask; --=20 2.35.1 From nobody Fri Jun 26 16:43:39 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 35DC7C433EF for ; Mon, 21 Feb 2022 07:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346262AbiBUHeF (ORCPT ); Mon, 21 Feb 2022 02:34:05 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:51598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346260AbiBUHdz (ORCPT ); Mon, 21 Feb 2022 02:33:55 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 729FA13E93 for ; Sun, 20 Feb 2022 23:33:19 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id i11so25738445eda.9 for ; Sun, 20 Feb 2022 23:33:19 -0800 (PST) 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=7vwiIAmZ+C5zWK8Si6mo1Eo/U2yGxbtvFyTLYxn/HBQ=; b=mSth5mYOd+JbeN6ChnQB18eVFGPVZYyVEOOm+a9pQwwf2xeVpbEDsi/M7QCex6nfOw vDP0Qa9ivOu6kycYSxLbT9+NawEFFkFk1JhnCo4ftONlit/4hNIVjI/QmrBluOmXCVa9 RvHXwuyRxC+m3mYksXqcKwTKsv+RckTRJ/q65AEEgnrzH17FRKH7BkpQvcRb4iyuZTmr 0mChZUcuF4buchFbG0cEUXdur6JN015BzwvzwBJDU1UtW/U2z+tKt6RwiFuWQmz+xUsQ RX2ruytPUf0GiCjxwSqaJKWwcMOlf1DLxuEmy6SyZ1oAU9Q/hUEOY3raNILkLqnlFPkG JWRw== 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=7vwiIAmZ+C5zWK8Si6mo1Eo/U2yGxbtvFyTLYxn/HBQ=; b=PIDf2EE+6W5PZ1Styqg6q1PRhOAWlbnstH/s8cXEQEw8Y18WLQSAHh98q4D2Abp1z6 EMB3ejqGJ3d0d7HfRwejREuYRSM5clKXKYxCNoVxXcjz2grK35Bgj9LEAoqjk9qhD7c6 NBMPOHB/nYWcOHXVUD/b9yJ3hPWZSNvKjbpHo4vyB0vYLFVYbzOfHibKitwWbBDIekU8 lPurvLxI5wEJxGYaQSln602EfhDKHtNdPUbORFt/YXkQ5uG5GxIbSgNFU+8CFxZZtgOE V//uczKIPru+xUUTUPcODZ19LMI4DxCd35px/81c3lGdnbV6scPoj8jHCqrwmnVJfNSC IsNA== X-Gm-Message-State: AOAM532hYAFs0xJcCr7VMCs48cJjzvnsPfBIkXwH1lBLDqya8q7gFVeG pUfmGtdFluMGQo8If3wwDts= X-Google-Smtp-Source: ABdhPJwWIvRI3iTGAk7rrx2uPOIatpxQhFfdhaoaWVxn0WgBWu2YL+jyz/FARb9qKVij+ttwEy+9Gg== X-Received: by 2002:a05:6402:144b:b0:410:b990:a68a with SMTP id d11-20020a056402144b00b00410b990a68amr19939616edx.25.1645428797947; Sun, 20 Feb 2022 23:33:17 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id c11sm8673128edx.42.2022.02.20.23.33.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 23:33:17 -0800 (PST) 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 4/5] staging: r8188eu: convert type of pBandWidth in odm_dm_struct Date: Mon, 21 Feb 2022 08:33:05 +0100 Message-Id: <20220221073306.16636-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221073306.16636-1-straube.linux@gmail.com> References: <20220221073306.16636-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" The variable pBandWidth in odm_dm_struct stores constants from enum ht_channel_width. Change the type of pBandWidth from u8 pointer to enum ht_channel_width pointer to get rid of a type cast in function Update_ODM_ComInfo_88E(). Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/hal/rtl8188e_dm.c | 2 +- drivers/staging/r8188eu/include/odm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index 082104c9b2e8..df0b412c52eb 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -40,7 +40,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) =20 dm_odm->pWirelessMode =3D &pmlmeext->cur_wireless_mode; dm_odm->pSecChOffset =3D &hal_data->nCur40MhzPrimeSC; - dm_odm->pBandWidth =3D (u8 *)&hal_data->CurrentChannelBW; + dm_odm->pBandWidth =3D &hal_data->CurrentChannelBW; dm_odm->pChannel =3D &hal_data->CurrentChannel; dm_odm->pbScanInProcess =3D &pmlmepriv->bScanInProcess; dm_odm->pbPowerSaving =3D &pwrctrlpriv->bpower_saving; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index fed12203c558..7a10f57b9bd3 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -324,7 +324,7 @@ struct odm_dm_struct { /* Secondary channel offset don't_care/below/above =3D 0/1/2 */ u8 *pSecChOffset; /* BW info 20M/40M/80M =3D 0/1/2 */ - u8 *pBandWidth; + enum ht_channel_width *pBandWidth; /* Central channel location Ch1/Ch2/.... */ u8 *pChannel; /* central channel number */ =20 --=20 2.35.1 From nobody Fri Jun 26 16:43:39 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 A3D53C433EF for ; Mon, 21 Feb 2022 07:34:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346363AbiBUHeX (ORCPT ); Mon, 21 Feb 2022 02:34:23 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:51514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346328AbiBUHdz (ORCPT ); Mon, 21 Feb 2022 02:33:55 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3DC0140AD for ; Sun, 20 Feb 2022 23:33:19 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id qx21so30754912ejb.13 for ; Sun, 20 Feb 2022 23:33:19 -0800 (PST) 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=hpPKMOOkrFJF8q2NbuFWkI8+0Qjpz9YTMzfUO37K1GE=; b=eVeSHrAldynujWT89vm1fFlDDPVKlpctWwU39dILonBi95xwqCqw6OKIjjukkEI/kL e1wA5Mq/vFT6w1LQ0H2D9Ng0+IPFc7Z09q/eSlD/g4GkkUvB3EkMjExQ8tHL1WaP804d Qjh0R3cHxj6Px9q+YpLm5Q/rVO9gPBFwOFWsT1XZGa18GHX8GBHFxIIv4dPx1xvd3F1q vKhwzN35gp3OvDiHjWRRSCRRYYXlA1Fw1hFUg1/DhT9er/+XELITrSU03rlgnBXMTrHc 3nVQ3K1qJX6fQzlUgYHHoC51VsmXFihTqow/1Fkqlvo4uwrorTC4EgCrq3rtEWNWe5/O 0D5A== 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=hpPKMOOkrFJF8q2NbuFWkI8+0Qjpz9YTMzfUO37K1GE=; b=OVQW7GMikMKCPex/42IcJDUJkHoFCqX2gk9MwYo5eYkZ8cpy6mbLjhjzaP9u7Bf8SI ZSLJfts7srir7X2LHBM7C4ukv0mKLld4jteeibWGFFN171F8VEywphOiKIUt/N26yXlQ KGngtfkvVBp9340JVRtkYOJikxnCErlmxeFXaOiUmvmwwLrRqSdezA7OZS1mVtE4iRbz U5rOLODo8E0GIkg6hkc/0GOhpVsjhqJ+YayaVCQ+b4pAvW1MXZ6mBDBCJwhNFgt7VFP0 ncA2W8bgTFJvnssaW8Kz9MiFcg5jRCQ1+m6WzjCtnjPflQEtUDOKb8aU+UX9H80JKxpg R5MQ== X-Gm-Message-State: AOAM5329GlEUDxOCxNfxSoZwEVtQlqAEBPP/d33LSxITrfsmJqkU6heU lWDn9O9aPXJwvnRx27vd0yU= X-Google-Smtp-Source: ABdhPJziO6jTr9J2uSUPk4q6xmDikxZKg+/yxSRzpUduiW5u07oqOlRVGvv0SL3D6Na77Ewv/4Z+VQ== X-Received: by 2002:a17:907:30cc:b0:6ce:d97:cb0f with SMTP id vl12-20020a17090730cc00b006ce0d97cb0fmr15023881ejb.0.1645428798560; Sun, 20 Feb 2022 23:33:18 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id c11sm8673128edx.42.2022.02.20.23.33.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 23:33:18 -0800 (PST) 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 5/5] staging: r8188eu: remove ODM_CmnInfoUpdate() Date: Mon, 21 Feb 2022 08:33:06 +0100 Message-Id: <20220221073306.16636-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221073306.16636-1-straube.linux@gmail.com> References: <20220221073306.16636-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" Each case in ODM_CmnInfoUpdate() just sets a single variable. Set the variables directly and remove ODM_CmnInfoUpdate(). Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/hal/odm.c | 21 +-------------------- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 4 ++-- drivers/staging/r8188eu/include/odm.h | 7 ------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/ha= l/odm.c index 5d2f934d78ae..94f9b125d860 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -464,7 +464,7 @@ static void odm_RSSIMonitorCheck(struct odm_dm_struct *= pDM_Odm) pdmpriv->EntryMinUndecoratedSmoothedPWDB =3D 0; =20 FindMinimumRSSI(Adapter); - ODM_CmnInfoUpdate(&pHalData->odmpriv, ODM_CMNINFO_RSSI_MIN, pdmpriv->MinU= ndecoratedPWDBForDM); + pHalData->odmpriv.RSSI_Min =3D pdmpriv->MinUndecoratedPWDBForDM; } =20 static void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_= Odm) @@ -639,25 +639,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, en= um odm_common_info_def Cmn pDM_Odm->BbSwingFlagOfdm =3D false; } =20 -/* Update Band/CHannel/.. The values are dynamic but non-per-packet. */ -void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Val= ue) -{ - /* */ - /* This init variable may be changed in run time. */ - /* */ - switch (CmnInfo) { - case ODM_CMNINFO_ABILITY: - pDM_Odm->SupportAbility =3D (u32)Value; - break; - case ODM_CMNINFO_LINK: - pDM_Odm->bLinked =3D (bool)Value; - break; - case ODM_CMNINFO_RSSI_MIN: - pDM_Odm->RSSI_Min =3D (u8)Value; - break; - } -} - void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI) { struct rtw_dig *pDM_DigTable =3D &pDM_Odm->DM_DigTable; diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8= 188eu/hal/rtl8188e_dm.c index df0b412c52eb..6d28e3dc0d26 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c @@ -36,7 +36,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapte= r) if (hal_data->AntDivCfg) pdmpriv->InitODMFlag |=3D ODM_BB_ANT_DIV; =20 - ODM_CmnInfoUpdate(dm_odm, ODM_CMNINFO_ABILITY, pdmpriv->InitODMFlag); + dm_odm->SupportAbility =3D pdmpriv->InitODMFlag; =20 dm_odm->pWirelessMode =3D &pmlmeext->cur_wireless_mode; dm_odm->pSecChOffset =3D &hal_data->nCur40MhzPrimeSC; @@ -80,7 +80,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter) bLinked =3D true; } =20 - ODM_CmnInfoUpdate(&hal_data->odmpriv, ODM_CMNINFO_LINK, bLinked); + hal_data->odmpriv.bLinked =3D bLinked; ODM_DMWatchdog(&hal_data->odmpriv); } =20 diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 7a10f57b9bd3..b88b3f3d08ee 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -122,19 +122,14 @@ enum odm_common_info_def { /* Fixed value: */ =20 /* HOOK BEFORE REG INIT----------- */ - ODM_CMNINFO_ABILITY, /* ODM_ABILITY_E */ ODM_CMNINFO_MP_TEST_CHIP, /* HOOK BEFORE REG INIT----------- */ =20 /* CALL BY VALUE------------- */ - ODM_CMNINFO_LINK, - ODM_CMNINFO_RSSI_MIN, ODM_CMNINFO_RF_ANTENNA_TYPE, /* u8 */ /* CALL BY VALUE-------------*/ }; =20 -/* 2011/10/20 MH Define ODM support ability. ODM_CMNINFO_ABILITY */ - enum odm_ability_def { /* BB ODM section BIT 0-15 */ ODM_BB_RSSI_MONITOR =3D BIT(4), @@ -455,6 +450,4 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm); void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def CmnInfo, u32 Value); =20 -void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Val= ue); - #endif --=20 2.35.1