From nobody Sat Jun 27 21:20:57 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 9B5E0C433EF for ; Sun, 20 Feb 2022 10:02:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243694AbiBTKDF (ORCPT ); Sun, 20 Feb 2022 05:03:05 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243714AbiBTKC6 (ORCPT ); Sun, 20 Feb 2022 05:02:58 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40EB83A73D for ; Sun, 20 Feb 2022 02:02:21 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id x5so23365419edd.11 for ; Sun, 20 Feb 2022 02:02:21 -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=PvjuSNwJ8S2bAfJeYCb6vqgAaUeufjbgam2qLYBulCE=; b=IWyTuQ9QU3bxQYW4bVMBvLJ/2j7QXL7x4dcZ6FZxSeWS6fWDqJCwgRCBusT81WzwDK nfUjLwsdxpxFrMSfckvEoxnCmR3bz/dkc//ItMXow+wiPGDcG6X7E7Z3hM8fUrIrn8iQ UtlKwzkGFdRnxLpjvj8DnBydIy4sF1aAB9Se/4LndqM6cP2fIchvgtTlomVBEh+1bwmy ERkl4ULYmKX/hnR2N6sxZaIUKB5kGuR2vGQpOKF/xHjQkdUUopQQl+0M40rHxjGaCJE/ ZD8biY+HHp+hLWxwPCdkh8/FZiYXJWyAxM9ZWWLlEVnKKDi48eicBKIdRvdRoOnMATpB TGug== 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=PvjuSNwJ8S2bAfJeYCb6vqgAaUeufjbgam2qLYBulCE=; b=BamQhEqXzOcSCj9Fgj1ygO5Wp+A3rB+NJi5uymewTIcyCuvG2szThnwsExS5Fmsiop l4tmU4AZ/Tby1xGWANAtCuniAACKVjMa5ay5UhpBTyJVHzuEDzdk6o/0tB2XadUj8zct mtcyJzEbVBLF9qMLtEgCV/9rmAes5X64VKsr4UVJvsXDwX5aSuZfWseaNcNBsQGNv40q X8p7ki62jGUkCc4OTeEdCbw44fVFLBXVXTEZwcvAaUC0oxasU2pERCpF1zNSwX2yFDm3 41/6LULNV1pvfs8vOCXzGd57Uph2fDRi0lNE3ctC9/7Ci+MTwOnOKAdIrfBy+C7kW8Sr oNlQ== X-Gm-Message-State: AOAM532F24fwxJpZjl0UIRJywINS56CGetrut7+uEgrE8TM3m86FLWQ/ DmoaCM3mJ0v2VumHlxaOgv4= X-Google-Smtp-Source: ABdhPJzylaPtQT7mAPX4yfG6fnOqCWzjjIWykVIZG1NnOeHK3b8Y9JWsjDsSPBi/x0vBfek+pjKLjQ== X-Received: by 2002:a05:6402:2801:b0:40f:f179:c3ca with SMTP id h1-20020a056402280100b0040ff179c3camr16321779ede.226.1645351339825; Sun, 20 Feb 2022 02:02:19 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id dx7sm3265223ejb.23.2022.02.20.02.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:02:19 -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 1/5] staging: r8188eu: remove ODM_CmnInfoHook() Date: Sun, 20 Feb 2022 11:02:08 +0100 Message-Id: <20220220100212.7466-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220220100212.7466-1-straube.linux@gmail.com> References: <20220220100212.7466-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 --- 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 Sat Jun 27 21:20:57 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 3C38FC433F5 for ; Sun, 20 Feb 2022 10:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243763AbiBTKDU (ORCPT ); Sun, 20 Feb 2022 05:03:20 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:47912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243723AbiBTKC6 (ORCPT ); Sun, 20 Feb 2022 05:02:58 -0500 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 19ED73AA58 for ; Sun, 20 Feb 2022 02:02:22 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id c6so20675734edk.12 for ; Sun, 20 Feb 2022 02:02:22 -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=j2xZHeiG083yzKkuwwrfxDMOHMTEvS0BBe2aT8XTSjE=; b=hMWAPNYnvQO0lcnti8nUKnHcotk1QbkXffJrttbjhU0QA3s/lyGM003DzA2UBvGB3a 8ZVw1TtigbpjW3DT3EltENukaIMcvit5TKjh55hTAVgaXbHOrxrSiIGRxmZq3h4+ECMy ndfEUzSI4Fz6zG5A1KLhpWQIdO8ehQfW6nH0JkLQkZh68i+LAcapXps4N98PDk36bRsb splozHraOAcPsv+8nlKwsnJcr3NT4nQ3S7/05DlqWUKPK+mMs8Itl7e6pch3RB8CtdfQ YxpfJDMELoLBw8MwGRZtoAfEyxBhiO3r9TrC5f9w8B0vYb82qTho29ER9UF8EyOsa+/y etkg== 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=j2xZHeiG083yzKkuwwrfxDMOHMTEvS0BBe2aT8XTSjE=; b=WZNfmoUcFC1gRR821RUq7GiAAuU2oTXBaWPBTgldYGnvwJOO3ep7n7z5UhMO74cidi 9PWwi8yfKp0mGc6ca5StaaxpVid7lXaVI05UErfBgacQUyndMQy6R4E0fYA+FPkrPVh/ H1fyv9hjg6SKhg16we0GXMpWhkjlpKW5BOMmq6kIgxcKBv4vWjxQMjS/lfVd9IF+nGKi hE1zT2P903wei+UOogg6fuhV4Tj1VIOxAMYFaiV2u0kccSKcq269Z51p+K+5Zfh7XygI rbt2r40F/7Bh2mdboqAifKAGI6eQgB1OudKzCWPw3qIIMyLHr4YTXM0VfMrCaXJhqHXp z4mA== X-Gm-Message-State: AOAM532KJ+HL1YyQu8h1zNGnZ9afapVJ8r7Ib0Sy3LnG+UHfNu/xjzjH p1jaAZoltVCvvC00UE0ne94= X-Google-Smtp-Source: ABdhPJzsB8+zYF+59/WpSNP/RSH7bKKUEtglBIWA5Bhy3x3nyt1rD4nxG82nO/B3HckRampxq8Y6oQ== X-Received: by 2002:aa7:d1d7:0:b0:410:d6cf:82b2 with SMTP id g23-20020aa7d1d7000000b00410d6cf82b2mr15799003edp.193.1645351340717; Sun, 20 Feb 2022 02:02:20 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id dx7sm3265223ejb.23.2022.02.20.02.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:02:20 -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 2/5] staging: r8188eu: convert two u8 variables to bool Date: Sun, 20 Feb 2022 11:02:09 +0100 Message-Id: <20220220100212.7466-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220220100212.7466-1-straube.linux@gmail.com> References: <20220220100212.7466-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 unsed 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 --- 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 Sat Jun 27 21:20:57 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 7C123C433F5 for ; Sun, 20 Feb 2022 10:02:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243735AbiBTKDP (ORCPT ); Sun, 20 Feb 2022 05:03:15 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243716AbiBTKC6 (ORCPT ); Sun, 20 Feb 2022 05:02:58 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5B8B3B02E for ; Sun, 20 Feb 2022 02:02:22 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id p9so25647009ejd.6 for ; Sun, 20 Feb 2022 02:02:22 -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=ZkI9AnkK9Hx4PE0VopfNSysIyR8hiEwnCg1vfX4w8qo=; b=UqLm+85YwRk5e03YO1uqe0i/H9qa5BM5sRFcQacfx7hN7MKcioBW+nf+ckCVknmxG0 PcRpIDaY2irp9R5pqLcuqTlIR5daTVtabb9O3zs0JuzXbiX7AE/FyAXcsbPuY6x2X6+L +CXmPZVhU+51kR3LD6YSwZbxWngdyYe79G4Se/vF93Oeyme8Txr8fvsm5OoCBwNjFfcC xzpZo/FtO6Dlflp5kWOz3Qf0WOoh7PCrJ4DlJjSyS7/xjaidlL5/6rM84sJzCosyZQY/ OMIKk2CDrsdc/oA/9nVgh9LUlJeML6aABSyfjoq3DzBkTc+mSRO7V0+f887r6chLIg1Y miuA== 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=ZkI9AnkK9Hx4PE0VopfNSysIyR8hiEwnCg1vfX4w8qo=; b=zD0XBIxgqhuURaANOCaYTPioEcbT2NBKlq0Olhr4noc15uQ9kzLObntibpI78WylbN X4evtKWChfO7V5lZMoQhnXh99PlOU/P/aRKEWQwbIX1PuJFT2B68J5XwlZA09HjDJRT5 8rb65q1NkmCZgrw0F6UtLugYcR83Z+ztsP2oQr9q4niE/9Y5KNlh8m3Z3DAd4XTxA/Yz A5pyT7mzCneyEGCHmZP+iyuLwD3DZtRKr+fhUOhZwT/eybvUSZTMRvyzDN2KKC2PSPk0 eCJakl6baweZqyMAVnbMv1kayI/U7TNcHp/bWIgr/dagRHjCnCVpb8FlfvQTv7ORENe8 Ob1w== X-Gm-Message-State: AOAM531hB5TtkRrvPL4JFJ4zERNxbQHe/ynRID9BOjoXHDVhcS0mHMGs i8E1/m56uU7iUEnQPqwj6gI= X-Google-Smtp-Source: ABdhPJwTnByq03MA+PvXGyxT/lHmMG/Sx7fAOD0r2B6r+Q/KfcPCPs7eFqmUhBEvkjnFhLaGdewsmA== X-Received: by 2002:a17:907:c92:b0:6b5:c8ae:7918 with SMTP id gi18-20020a1709070c9200b006b5c8ae7918mr11823612ejc.531.1645351341478; Sun, 20 Feb 2022 02:02:21 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id dx7sm3265223ejb.23.2022.02.20.02.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:02:21 -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 3/5] staging: r8188eu: remove enum odm_bw Date: Sun, 20 Feb 2022 11:02:10 +0100 Message-Id: <20220220100212.7466-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220220100212.7466-1-straube.linux@gmail.com> References: <20220220100212.7466-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 --- 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 Sat Jun 27 21:20:57 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 C5EC5C433EF for ; Sun, 20 Feb 2022 10:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243685AbiBTKDN (ORCPT ); Sun, 20 Feb 2022 05:03:13 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243717AbiBTKC6 (ORCPT ); Sun, 20 Feb 2022 05:02:58 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E3683B28E for ; Sun, 20 Feb 2022 02:02:23 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id p14so25540898ejf.11 for ; Sun, 20 Feb 2022 02:02:23 -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=eOF+6ocqxTqypgBTBzKCjDrqeVxrdZjcFH/y4rV+6HA=; b=jWVjxzOvrWx/nCcXQkfKa5ZYV0BhFa/OpARjipv5jeeUMj2V+BCu3bMb1Br8u4KoBp Rj5oGwE5dYbbtfqhrepm6IBbc/gsCitFbCX8W7TPStDKoZTvO7qV0foEweN8IbQ75hF8 DR2uuUkWPnn5X2zDLSsseuNEzzLwCGC3y8qEN/RudodAZ11ySQZ+lASKqzFUBMxmJ6r+ 2uH4DTVj5JlmKbcHP77fN6OSET+W2UkJMLGZcgQIhudeyFTJkUHkk9+e7MNVr8vP+xSa zPiYIZIl0/hDa8feObC9Pgib0KPIJ7VQYsHfFOmv8o5uGCFIaLPUNjQ18ZUvX20lApRo ztvg== 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=eOF+6ocqxTqypgBTBzKCjDrqeVxrdZjcFH/y4rV+6HA=; b=3VXjrmWyyGI5UPXmNsQkUV+YddfxpxPpt+f17eYXLQokCMp8Yhn7rB9cU2WAC1u9xI 5lNhju4yfov30hHLOOvf3j8hTNcYrXGFkr/ycQqKIU5VOHzYAwn7u/47oMOjfaQOECze d6n2/S+wOt2asBujEW4tsHfxbMbPhF+maxzmfA0BGRU/2zInRsUgZvA4KVcq3T1i+u4k o4xPYG4WmJwc/rAk07dMdDN7IJZy/olTrkh83G4E0gt6WQ1CGvdYkYxTbH0K7cTlA3qU yL+C+JhE7PWH/AoAgBGxnuleJsJNtpXu8ld6egYRNhIIA6Iu0n9GT28/WckZh6wkUTNZ OnZw== X-Gm-Message-State: AOAM532Vy3zwIuY7/wES2cKIL4DtGqQAyV//gTjJFP/rf1fyuc9ORZID d+ykLxdQJ1SRrNhLYl0itsY= X-Google-Smtp-Source: ABdhPJzTNKLUK1Pj6FLjvvc8LuILPzRu9yu4COr58vWn7XHhfmKipJuWAeT5U6DwjS2tTHE+w7n+BA== X-Received: by 2002:a17:907:7845:b0:6cd:f2f4:cf00 with SMTP id lb5-20020a170907784500b006cdf2f4cf00mr12102761ejc.388.1645351342191; Sun, 20 Feb 2022 02:02:22 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id dx7sm3265223ejb.23.2022.02.20.02.02.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:02:21 -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 4/5] staging: r8188eu: convert type of pBandWidth in odm_dm_struct Date: Sun, 20 Feb 2022 11:02:11 +0100 Message-Id: <20220220100212.7466-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220220100212.7466-1-straube.linux@gmail.com> References: <20220220100212.7466-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 --- 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 Sat Jun 27 21:20:57 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 5D4ACC433F5 for ; Sun, 20 Feb 2022 10:02:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243709AbiBTKDK (ORCPT ); Sun, 20 Feb 2022 05:03:10 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:47910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243718AbiBTKC6 (ORCPT ); Sun, 20 Feb 2022 05:02:58 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D87C3B2B5 for ; Sun, 20 Feb 2022 02:02:24 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id p9so25647113ejd.6 for ; Sun, 20 Feb 2022 02:02:24 -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=+FtVTON5NgIkD0WmM1NUxGxYzj2A7X0c0C9dZIEX6+k=; b=CVX7xlP8KQUUXAWtHkmsQfk+3plBV19i057kKwZjO+yD0rIEWp4z9jTPPS3f8BBRi9 I8KMKn8rRtLOGgI3S+ikTvwjoJA2bkjFWZ1FRdmMUcbDo0sc+fPsbVXR6sjSArIYrME8 8yw0J75lJrf8sBocttSH9DotVycoEtoWXX9TIQvBnWRLwf+y+7J4l6CwbWfGfjmyD6ot i2zZ5Rgv3hqlYpd/FmQphXXmmsUMPVC3fYIw1rd33GFDZJQ3OcLyIVrB0TL4imjlWeFb 8gRd1DWGNRb2Vr6UIGlQij1srYBgJKthnRsahrWBfoXcYzI8PxReVFjcoFGTHb1frCQu gwOA== 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=+FtVTON5NgIkD0WmM1NUxGxYzj2A7X0c0C9dZIEX6+k=; b=7hcW/ujrxE3oqK8KpQWFqmZF5ste8IKE/pdOP3Mj64m+x3kbBp4520VgxaTDHmH4Bl n0wsu333yhzlrjaD3t9XIUA8qK7S1xcz0BCARA3b0zS9J+xp3zG9wowRYT8oDL/QFgSf 5ODb3So2eKX050xa6nFsKlEUdAkPA60gyy4LVk1bN+9GMQTF5USGCf940qv4IvO9BUfu ckHK8p3n/sE3/RUR9fr3jt6xQIqlpXLTgwG6L2svgCLJKS/InXxa7w4khAeW7NkDs8xP zxjc4UsHW+QVDfwldDlPjCfhuzaugKY3fepmdQA1oUZSQNVxaQx6YErdC01ugE5l5/Om 0RAw== X-Gm-Message-State: AOAM530qyNBoAQTL7A3XfwqQAotJCUElfv0qFxdhwFxbfcJce+2tuHMf 8xpMEXryQwFlCI6sJx1oez4= X-Google-Smtp-Source: ABdhPJziPjk3j9hUjH4ORe5Jq2hFDIhoHtCHQwiA9LAapRpxIUs3Str3j3PqVBOaU5WsZo6x65wYbQ== X-Received: by 2002:a17:906:d935:b0:6cc:fcfc:c286 with SMTP id rn21-20020a170906d93500b006ccfcfcc286mr12151046ejb.423.1645351343160; Sun, 20 Feb 2022 02:02:23 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id dx7sm3265223ejb.23.2022.02.20.02.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:02:22 -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 5/5] staging: r8188eu: remove ODM_CmnInfoUpdate() Date: Sun, 20 Feb 2022 11:02:12 +0100 Message-Id: <20220220100212.7466-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220220100212.7466-1-straube.linux@gmail.com> References: <20220220100212.7466-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 --- 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