From nobody Wed Feb 11 14:20:48 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 29CEBC6FD19 for ; Mon, 13 Mar 2023 22:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230093AbjCMWrz (ORCPT ); Mon, 13 Mar 2023 18:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbjCMWrw (ORCPT ); Mon, 13 Mar 2023 18:47:52 -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 7D4C387DA8 for ; Mon, 13 Mar 2023 15:47:19 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id r15so27719608edq.11 for ; Mon, 13 Mar 2023 15:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678747589; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=i9MmR4Fr1wEZcYJSTx2GTu6KpmAYC+ytQi2ef1yhiNY=; b=FRE7CYku/c6ERZDOHGzdq/FzlC+UHqtMuf5h8jrHPYW34DPFcPoAEigzKEr8yb9ZFW R4gZA0NhrooNgyA1i3LzuaxMJ5vjaOiLKjxBVbT0IH5A1WCWphmZ0cUfxrtSTlPmyBi7 TDZk2vqWA5qzobJNPvJRuuNb6u1I6/27co6PKixB7GkC1BNzdrWw+EfQT8eY5vf+1q/I dYwfS18MeSCdsI4txx1hBpcjwqDkwUSGDQQ/aAf1czvJgVeHGui2rVS8YuH+b/rJ5Stu TUfy3iGyWQr7uVlTq40DQzKeFLivehOIxoK5Kh7MMvc3/bAkmr4TC4zqxIcXPL+Oejaq b4Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678747589; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=i9MmR4Fr1wEZcYJSTx2GTu6KpmAYC+ytQi2ef1yhiNY=; b=OiVE6U8BpM6nIHlc/bK92dhpS0Fzqbw5D3I2CTCScyxOe8BQjZFxGjq4ZZ2sYo65nc GqTYF5YXdEY0HnMMGyV+Fll/MHBw4gxxwR+MSa111xhmvWIQGmFv/UmL8F4o8c3/gK8O WZUOCjNp0orT0zNfk8zTDekp3+pcuvtBuWk8efq/wGVaWg2PT2vDxGdRo7D74/l+V97E ZrqmFo8aP13hycvzQ9pT0/hMc3+W+3rO0qMcCpE1M0pMOzSJ3ZULYRc/+bj/f4XmXy29 KA8dffyUufAi3nFptGFkwPV0az37PufgFG/jrCBOMfQfK99oXK9T9x4lBBieHlvFA4e1 9oBQ== X-Gm-Message-State: AO0yUKV5L7igq2TPh1nEPZR10mZRU8TF9WVE1EwL6+OW1ijnirL+R1HN BwthggylyM+wpRiTZm0et8w= X-Google-Smtp-Source: AK7set/lHm9jtll06aMNqvCOy3aH8w8VJcmQ8/81auVCfFaHsERNvXRe4ab5G6/Qndp7EFt93Ct//w== X-Received: by 2002:a05:6402:1d54:b0:4fb:ac81:49bf with SMTP id dz20-20020a0564021d5400b004fbac8149bfmr6958040edb.4.1678747589456; Mon, 13 Mar 2023 15:46:29 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id s23-20020a50ab17000000b004f1e91c9f87sm299296edc.3.2023.03.13.15.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 15:46:29 -0700 (PDT) Date: Mon, 13 Mar 2023 23:46:27 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: rtl8192e: Replace RF90_PATH_C in test expression of for loop Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace RF90_PATH_C in test expression of the for loop with the variable that is commonly used. This avoids false hits when searching for usage of RF90_PATH_C and therefore improves readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index db26e431f8b7..fb4eede0470a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1514,7 +1514,7 @@ static void _rtl92e_process_phyinfo(struct r8192_priv= *priv, u8 *buffer, return; =20 if (!prev_st->bIsCCK && prev_st->bPacketToSelf) { - for (rfpath =3D RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) { + for (rfpath =3D RF90_PATH_A; rfpath < priv->num_total_rf_path; rfpath++)= { if (!rtl92e_is_legal_rf_path(priv->rtllib->dev, rfpath)) continue; if (priv->stats.rx_rssi_percentage[rfpath] =3D=3D 0) { --=20 2.39.2 From nobody Wed Feb 11 14:20:48 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 8198AC6FD1D for ; Mon, 13 Mar 2023 22:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230154AbjCMWr6 (ORCPT ); Mon, 13 Mar 2023 18:47:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230103AbjCMWrx (ORCPT ); Mon, 13 Mar 2023 18:47:53 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 334DF25961 for ; Mon, 13 Mar 2023 15:47:20 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id r11so3298564edd.5 for ; Mon, 13 Mar 2023 15:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678747596; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=7TLZPnNjrnRgbjwrvS44w5hw2N4GLY0cSoAaZVi2pEE=; b=m2RSEuBg0uEtg2iVzUp5mmt9ug6IBwTaXbhdRNeZes19EZssRfA1BB4LCbEdmW6pAz jm44m5UyhfAUX3+7i+m/3yhxih4YgEUpHfGiKXZchdyequTJ8eoP5wmW2ZosP5DJ48aE LpPSiJQXvT7dz7gTBxe40aEAvUGoa5h9SAy+hETJNEE8BgTuuzn2N2I3scH90WAttozv 7WDzIhJJ4eiBcbkaEL/87QznljGgGadRH54DuXHXXgEzweeABef0CY6pnvdQZbtBGOl1 YB5k8yBveAYl0U8O2oLkxaKhWRoml6+uBOhUnxrYBH18Dfhld8aGrNayTA/IxKvv3Y6y YSmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678747596; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7TLZPnNjrnRgbjwrvS44w5hw2N4GLY0cSoAaZVi2pEE=; b=aGa9yjwAdvp8S5AexAmxYxzGZdsgdoR8lrTSHnZPaqkJuVU8h38psDDkM2ZZaXePR6 K4PpP0Rn0G70CSxFk4vxJEjVaXEZYGggn7T2zqVeT5pJ7ZWVf4q4dodywBCUdgpEYXXv l0EtA9ZeT11OUjgo3Dj9OS1donf7Y4VYKuEbvqmbt5Qxzpip3xqPB2pxq4W2SozDZRrr s7QEqUQu7fhIXh9DjsJtcQ0HhK6FCDvt6ta7CcBPfk1gb1DJFhMRLMCVClDdb1KhSF2e Ibk838+4wzpfhixXpmytX3BaF/ItdUvoAXR8KR7/+MfIpCQ3usUf0POpi5dpnFd0qlb/ 0PBw== X-Gm-Message-State: AO0yUKVNm1JsI3EIrBNOjfA0SN9Vt0wdH7SLg+G4unfIJCzesA9dW1Ek BWMIIfHdS6WDa/v6Tbz130w= X-Google-Smtp-Source: AK7set84rSY1OsAj8JuHwi2bhHdSLhfvney4ee37GxjdCGjMcvFLEcvNLfIrlF0fkpKd4/m1wWYVJQ== X-Received: by 2002:a17:906:73c9:b0:8f0:ba09:4abe with SMTP id n9-20020a17090673c900b008f0ba094abemr12465653ejl.2.1678747595930; Mon, 13 Mar 2023 15:46:35 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id de11-20020a1709069bcb00b008d1dc5f5692sm309765ejc.76.2023.03.13.15.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 15:46:35 -0700 (PDT) Date: Mon, 13 Mar 2023 23:46:33 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: rtl8192e: Remove function rtl92e_is_legal_rf_path Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove function rtl92e_is_legal_rf_path that will always return 1. Reason is that the eRFPath is always 0 for RF90_PATH_A or 1 for RF90_PATH_B but never 2 or 3. In most usage cases this is easy to see but for the following functions that use rtl92e_is_legal_rf_path it is more difficult: rtl92e_set_rf_reg and rtl92e_get_rf_reg are used in: rtl92e_set_bandwidth (eRFPath only for 0 and 1) rtl92e_config_rf (eRFPath only for 0 and 1) _rtl92e_phy_switch_channel_step (eRFPath only for 0 and 1) _rtl92e_dm_check_tx_power_tracking_thermal (eRFPath only for 0) rtl92e_check_bb_and_rf is used in: rtl92e_config_rf (eRFPath only for 0 and 1) _rtl92e_bb_config_para_file (eRFPath only for 0) rtl92e_config_rf_path is used in: rtl92e_config_rf (eRFPath only for 0 and 1) Remove dead code. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 ------ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 18 ------------------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - 4 files changed, 27 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/s= taging/rtl8192e/rtl8192e/r8190P_rtl8256.c index ecbcf0d5bb68..bb4539e337c8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -22,9 +22,6 @@ void rtl92e_set_bandwidth(struct net_device *dev, } =20 for (eRFPath =3D 0; eRFPath < priv->num_total_rf_path; eRFPath++) { - if (!rtl92e_is_legal_rf_path(dev, eRFPath)) - continue; - switch (bandwidth) { case HT_CHANNEL_WIDTH_20: rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath, @@ -67,9 +64,6 @@ bool rtl92e_config_rf(struct net_device *dev) =20 for (eRFPath =3D (enum rf90_radio_path)RF90_PATH_A; eRFPath < priv->num_total_rf_path; eRFPath++) { - if (!rtl92e_is_legal_rf_path(dev, eRFPath)) - continue; - pPhyReg =3D &priv->phy_reg_def[eRFPath]; =20 switch (eRFPath) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index fb4eede0470a..1e7be321721b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1515,8 +1515,6 @@ static void _rtl92e_process_phyinfo(struct r8192_priv= *priv, u8 *buffer, =20 if (!prev_st->bIsCCK && prev_st->bPacketToSelf) { for (rfpath =3D RF90_PATH_A; rfpath < priv->num_total_rf_path; rfpath++)= { - if (!rtl92e_is_legal_rf_path(priv->rtllib->dev, rfpath)) - continue; if (priv->stats.rx_rssi_percentage[rfpath] =3D=3D 0) { priv->stats.rx_rssi_percentage[rfpath] =3D prev_st->RxMIMOSignalStrength[rfpath]; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index e3886db3bfbb..51a20379dca0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -47,20 +47,6 @@ static u32 _rtl92e_calculate_bit_shift(u32 dwBitMask) return ffs(dwBitMask) - 1; } =20 -u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath) -{ - u8 ret =3D 1; - struct r8192_priv *priv =3D rtllib_priv(dev); - - if (priv->rf_type =3D=3D RF_1T2R) { - if (eRFPath =3D=3D RF90_PATH_A || eRFPath =3D=3D RF90_PATH_B) - ret =3D 1; - else if (eRFPath =3D=3D RF90_PATH_C || eRFPath =3D=3D RF90_PATH_D) - ret =3D 0; - } - return ret; -} - void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMas= k, u32 dwData) { @@ -196,8 +182,6 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf9= 0_radio_path eRFPath, struct r8192_priv *priv =3D rtllib_priv(dev); u32 Original_Value, BitShift, New_Value; =20 - if (!rtl92e_is_legal_rf_path(dev, eRFPath)) - return; if (priv->rtllib->rf_power_state !=3D rf_on && !priv->being_init_adapter) return; =20 @@ -233,8 +217,6 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90= _radio_path eRFPath, u32 Original_Value, Readback_Value, BitShift; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - if (!rtl92e_is_legal_rf_path(dev, eRFPath)) - return 0; if (priv->rtllib->rf_power_state !=3D rf_on && !priv->being_init_adapter) return 0; mutex_lock(&priv->rf_mutex); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index ac640033e843..f1d183ed7ca4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -49,7 +49,6 @@ enum rf90_radio_path { #define bMaskLWord 0x0000ffff #define bMaskDWord 0xffffffff =20 -u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath); void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask, u32 dwData); u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask= ); --=20 2.39.2