From nobody Sat Apr 18 09:22:00 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 B5544C43334 for ; Fri, 15 Jul 2022 06:29:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231562AbiGOG3Y (ORCPT ); Fri, 15 Jul 2022 02:29:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231521AbiGOG3T (ORCPT ); Fri, 15 Jul 2022 02:29:19 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C1F51400C for ; Thu, 14 Jul 2022 23:29:17 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id l23so7275266ejr.5 for ; Thu, 14 Jul 2022 23:29:17 -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=ZpAPTfgn7x2hsoU7pkb7QkeWbRt4wtXC22iLXqSjDL4=; b=c5NkWkSZZOQBe02NEl3AvDe0K9J9M82NsylzabjkTi+Ew2NM+LqWLPYuOcto24LOB5 wqOz2ZMolxu+Z3Rz/e6l/RjEoihpnHaKF+5gLK7qevxNMqujaJdEphbLx83tkxF70JdN 6C0lHSJthiiMhswWTYMeKlKrRIQ83NpWgxS0yqDPIG+tusggGpm7zdcmdefVj0j+Kgq4 kzjvb2yXVi02bgVzoyxTDTGMWhcqHHiFaWmdsj56359P+lKj4tBXA3utliCSoh4M+6SN c23AUEYlHGiPTZHFwwYWNU5oT7Rv0/KHjaGemUGLqZIJ4vXYc4Y9JG+LwJzgAFa3Pk50 Xcog== 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=ZpAPTfgn7x2hsoU7pkb7QkeWbRt4wtXC22iLXqSjDL4=; b=xoMNfCRV3ZS+L9oBLJ+++h0UAYT2j1NkCcD0SLvdWYDAgRlObzqDL39oByQT+RNYeq 53dJ27SHPyYA3j1Wkip+zX9Bbown4dUrNxh9S05jjukH2xu5Xj3UACN0npq80GNvJVZS RqUoelrLqgqo6UOXqWtv0+OknpYoM2G3tpmtHXUBRvKlEMAQqmxLKKiMwTdDdJ/Pybx8 o8YQkESNXEGKVGy92cJcMA8FKWBAEMhew69j6fMCb/QSMjKTE3ZuubSDKO+rVbhtWYG2 JCyi2XAcdirCC5KNZdeAp082KakS3yP9bksCDXAKUeai0an1lz42DJr/7MvobBrydNpb ooTQ== X-Gm-Message-State: AJIora/pjzf7vdVfhvZmceFRWR+ZNevmKoG6aMQuT1vofgq1lLB9zaKn L6AzaTeWYcsvGIqNLzHNVUs= X-Google-Smtp-Source: AGRyM1swEBzt38NEiNNoen9segqLBmiaLfupfNuGywhrotsTDuoBbyCZBzpnkWSi4tUodEBJ74dnew== X-Received: by 2002:a17:907:d07:b0:72e:ec79:ad0f with SMTP id gn7-20020a1709070d0700b0072eec79ad0fmr3119563ejc.296.1657866556076; Thu, 14 Jul 2022 23:29:16 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb91.dynamic.kabel-deutschland.de. [95.90.187.145]) by smtp.gmail.com with ESMTPSA id ku5-20020a170907788500b007262a5e2204sm1614515ejc.153.2022.07.14.23.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 23:29:15 -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 1/5] staging: r8188eu: remove HW_VAR_SET_OPMODE from SetHwReg8188EU() Date: Fri, 15 Jul 2022 08:29:04 +0200 Message-Id: <20220715062908.8547-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220715062908.8547-1-straube.linux@gmail.com> References: <20220715062908.8547-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 the HW_VAR_SET_OPMODE case from SetHwReg8188EU() and move the functions that are called by that case to rtw_mlme_ext.c. This is part of the ongoing effort to get rid of SetHwReg8188EU(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 103 +++++++++++++++- drivers/staging/r8188eu/hal/usb_halinit.c | 111 +----------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - .../staging/r8188eu/include/rtw_mlme_ext.h | 2 + 4 files changed, 107 insertions(+), 110 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 771910763fec..0edcf84db16d 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5674,6 +5674,107 @@ void clear_beacon_valid_bit(struct adapter *adapter) rtw_write8(adapter, REG_TDECTRL + 2, reg | BIT(0)); } =20 +void rtw_resume_tx_beacon(struct adapter *adapt) +{ + struct hal_data_8188e *haldata =3D &adapt->haldata; + + /* 2010.03.01. Marked by tynli. No need to call workitem beacause we rec= ord the value */ + /* which should be read from register to a global variable. */ + + rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) | BIT(= 6)); + haldata->RegFwHwTxQCtrl |=3D BIT(6); + rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0xff); + haldata->RegReg542 |=3D BIT(0); + rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542); +} + +void rtw_stop_tx_beacon(struct adapter *adapt) +{ + struct hal_data_8188e *haldata =3D &adapt->haldata; + + /* 2010.03.01. Marked by tynli. No need to call workitem beacause we rec= ord the value */ + /* which should be read from register to a global variable. */ + + rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) & (~BI= T(6))); + haldata->RegFwHwTxQCtrl &=3D (~BIT(6)); + rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0x64); + haldata->RegReg542 &=3D ~(BIT(0)); + rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542); + + /* todo: CheckFwRsvdPageContent(Adapter); 2010.06.23. Added by tynli. */ +} + +static void rtw_set_opmode(struct adapter *adapter, u8 mode) +{ + u8 val8; + int res; + + /* disable Port0 TSF update */ + res =3D rtw_read8(adapter, REG_BCN_CTRL, &val8); + if (res) + return; + + rtw_write8(adapter, REG_BCN_CTRL, val8 | BIT(4)); + + /* set net_type */ + res =3D rtw_read8(adapter, MSR, &val8); + if (res) + return; + + val8 &=3D 0x0c; + val8 |=3D mode; + rtw_write8(adapter, MSR, val8); + + if ((mode =3D=3D _HW_STATE_STATION_) || (mode =3D=3D _HW_STATE_NOLINK_)) { + rtw_stop_tx_beacon(adapter); + + rtw_write8(adapter, REG_BCN_CTRL, 0x19);/* disable atim wnd */ + } else if (mode =3D=3D _HW_STATE_ADHOC_) { + rtw_resume_tx_beacon(adapter); + rtw_write8(adapter, REG_BCN_CTRL, 0x1a); + } else if (mode =3D=3D _HW_STATE_AP_) { + rtw_resume_tx_beacon(adapter); + + rtw_write8(adapter, REG_BCN_CTRL, 0x12); + + /* Set RCR */ + rtw_write32(adapter, REG_RCR, 0x7000208e);/* CBSSID_DATA must set to 0,r= eject ICV_ERR packet */ + /* enable to rx data frame */ + rtw_write16(adapter, REG_RXFLTMAP2, 0xFFFF); + /* enable to rx ps-poll */ + rtw_write16(adapter, REG_RXFLTMAP1, 0x0400); + + /* Beacon Control related register for first time */ + rtw_write8(adapter, REG_BCNDMATIM, 0x02); /* 2ms */ + + rtw_write8(adapter, REG_ATIMWND, 0x0a); /* 10ms */ + rtw_write16(adapter, REG_BCNTCFG, 0x00); + rtw_write16(adapter, REG_TBTT_PROHIBIT, 0xff04); + rtw_write16(adapter, REG_TSFTR_SYN_OFFSET, 0x7fff);/* +32767 (~32ms) */ + + /* reset TSF */ + rtw_write8(adapter, REG_DUAL_TSF_RST, BIT(0)); + + /* BIT(3) - If set 0, hw will clr bcnq when tx becon ok/fail or port 0 */ + res =3D rtw_read8(adapter, REG_MBID_NUM, &val8); + if (res) + return; + + rtw_write8(adapter, REG_MBID_NUM, val8 | BIT(3) | BIT(4)); + + /* enable BCN0 Function for if1 */ + /* don't enable update TSF0 for if1 (due to TSF update when beacon/probe= rsp are received) */ + rtw_write8(adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP | EN_BCN_FUN= CTION | BIT(1))); + + /* dis BCN1 ATIM WND if if2 is station */ + res =3D rtw_read8(adapter, REG_BCN_CTRL_1, &val8); + if (res) + return; + + rtw_write8(adapter, REG_BCN_CTRL_1, val8 | BIT(0)); + } +} + /*************************************************************************= *** =20 Following are some utitity fuctions for WiFi MLME @@ -7142,7 +7243,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) type =3D _HW_STATE_NOLINK_; } =20 - SetHwReg8188EU(padapter, HW_VAR_SET_OPMODE, (u8 *)(&type)); + rtw_set_opmode(padapter, type); =20 return H2C_SUCCESS; } diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 421fe7c40390..b8fd73ac8f7c 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -963,117 +963,12 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter) kfree(efuse_buf); } =20 -static void ResumeTxBeacon(struct adapter *adapt) -{ - struct hal_data_8188e *haldata =3D &adapt->haldata; - - /* 2010.03.01. Marked by tynli. No need to call workitem beacause we rec= ord the value */ - /* which should be read from register to a global variable. */ - - rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) | BIT(= 6)); - haldata->RegFwHwTxQCtrl |=3D BIT(6); - rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0xff); - haldata->RegReg542 |=3D BIT(0); - rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542); -} - -static void StopTxBeacon(struct adapter *adapt) -{ - struct hal_data_8188e *haldata =3D &adapt->haldata; - - /* 2010.03.01. Marked by tynli. No need to call workitem beacause we rec= ord the value */ - /* which should be read from register to a global variable. */ - - rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) & (~BI= T(6))); - haldata->RegFwHwTxQCtrl &=3D (~BIT(6)); - rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0x64); - haldata->RegReg542 &=3D ~(BIT(0)); - rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542); - - /* todo: CheckFwRsvdPageContent(Adapter); 2010.06.23. Added by tynli. */ -} - -static void hw_var_set_opmode(struct adapter *Adapter, u8 *val) -{ - u8 val8; - u8 mode =3D *((u8 *)val); - int res; - - /* disable Port0 TSF update */ - res =3D rtw_read8(Adapter, REG_BCN_CTRL, &val8); - if (res) - return; - - rtw_write8(Adapter, REG_BCN_CTRL, val8 | BIT(4)); - - /* set net_type */ - res =3D rtw_read8(Adapter, MSR, &val8); - if (res) - return; - - val8 &=3D 0x0c; - val8 |=3D mode; - rtw_write8(Adapter, MSR, val8); - - if ((mode =3D=3D _HW_STATE_STATION_) || (mode =3D=3D _HW_STATE_NOLINK_)) { - StopTxBeacon(Adapter); - - rtw_write8(Adapter, REG_BCN_CTRL, 0x19);/* disable atim wnd */ - } else if (mode =3D=3D _HW_STATE_ADHOC_) { - ResumeTxBeacon(Adapter); - rtw_write8(Adapter, REG_BCN_CTRL, 0x1a); - } else if (mode =3D=3D _HW_STATE_AP_) { - ResumeTxBeacon(Adapter); - - rtw_write8(Adapter, REG_BCN_CTRL, 0x12); - - /* Set RCR */ - rtw_write32(Adapter, REG_RCR, 0x7000208e);/* CBSSID_DATA must set to 0,r= eject ICV_ERR packet */ - /* enable to rx data frame */ - rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF); - /* enable to rx ps-poll */ - rtw_write16(Adapter, REG_RXFLTMAP1, 0x0400); - - /* Beacon Control related register for first time */ - rtw_write8(Adapter, REG_BCNDMATIM, 0x02); /* 2ms */ - - rtw_write8(Adapter, REG_ATIMWND, 0x0a); /* 10ms */ - rtw_write16(Adapter, REG_BCNTCFG, 0x00); - rtw_write16(Adapter, REG_TBTT_PROHIBIT, 0xff04); - rtw_write16(Adapter, REG_TSFTR_SYN_OFFSET, 0x7fff);/* +32767 (~32ms) */ - - /* reset TSF */ - rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(0)); - - /* BIT(3) - If set 0, hw will clr bcnq when tx becon ok/fail or port 0 */ - res =3D rtw_read8(Adapter, REG_MBID_NUM, &val8); - if (res) - return; - - rtw_write8(Adapter, REG_MBID_NUM, val8 | BIT(3) | BIT(4)); - - /* enable BCN0 Function for if1 */ - /* don't enable update TSF0 for if1 (due to TSF update when beacon/probe= rsp are received) */ - rtw_write8(Adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP | EN_BCN_FUN= CTION | BIT(1))); - - /* dis BCN1 ATIM WND if if2 is station */ - res =3D rtw_read8(Adapter, REG_BCN_CTRL_1, &val8); - if (res) - return; - - rtw_write8(Adapter, REG_BCN_CTRL_1, val8 | BIT(0)); - } -} - void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) { u8 reg; int res; =20 switch (variable) { - case HW_VAR_SET_OPMODE: - hw_var_set_opmode(Adapter, val); - break; case HW_VAR_CORRECT_TSF: { u64 tsf; @@ -1084,7 +979,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variab= le, u8 *val) pmlmeinfo->bcn_interval * 1024) - 1024; /* us */ =20 if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || ((pmlmein= fo->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) - StopTxBeacon(Adapter); + rtw_stop_tx_beacon(Adapter); =20 /* disable related TSF function */ res =3D rtw_read8(Adapter, REG_BCN_CTRL, ®); @@ -1104,7 +999,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variab= le, u8 *val) rtw_write8(Adapter, REG_BCN_CTRL, reg | BIT(3)); =20 if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || ((pmlmein= fo->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) - ResumeTxBeacon(Adapter); + rtw_resume_tx_beacon(Adapter); } break; default: @@ -1221,7 +1116,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter= *adapt) =20 _BeaconFunctionEnable(adapt, true, true); =20 - ResumeTxBeacon(adapt); + rtw_resume_tx_beacon(adapt); =20 res =3D rtw_read8(adapt, bcn_ctrl_reg, ®); if (res) diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 819d0dc6e6dc..e1dfd621a5cb 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -9,7 +9,6 @@ #include "Hal8188EPhyCfg.h" =20 enum hw_variables { - HW_VAR_SET_OPMODE, HW_VAR_CORRECT_TSF, }; =20 diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index c630700ea657..28416d1bd15c 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -532,6 +532,8 @@ unsigned int send_delba(struct adapter *padapter, u8 in= itiator, u8 *addr); unsigned int send_beacon(struct adapter *padapter); bool get_beacon_valid_bit(struct adapter *adapter); void clear_beacon_valid_bit(struct adapter *adapter); +void rtw_resume_tx_beacon(struct adapter *adapt); +void rtw_stop_tx_beacon(struct adapter *adapt); =20 void start_clnt_assoc(struct adapter *padapter); void start_clnt_auth(struct adapter *padapter); --=20 2.37.0 From nobody Sat Apr 18 09:22:00 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 67A5DC43334 for ; Fri, 15 Jul 2022 06:29:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230510AbiGOG3c (ORCPT ); Fri, 15 Jul 2022 02:29:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231529AbiGOG3T (ORCPT ); Fri, 15 Jul 2022 02:29:19 -0400 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 34EF3140C5 for ; Thu, 14 Jul 2022 23:29:18 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id b11so7228770eju.10 for ; Thu, 14 Jul 2022 23:29:18 -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=X89jDaGowxydv3IxBOHofGRc/LRUGA8qaJv5vJJEJVY=; b=Pk/8mX6wNFZD0mvSAiDLz/5lUSt/eRgeJ8mJp/TWVlbD696I+jh8Yq+NZhV1ncznUS 52KtsYVKeG8niQ+cvnu1SLBQ/1FbS78ClBon+dwsxvL1hS6NXDQIqs9w9dmmh8jWvvf/ rTqsDzoYMCohIV8tlcwFvI3aiFAJ3jgZg0Ie5goFzigpvCtZvFkDzSwUIyLBddoTmiMo /yOmj5At0CZOfxyWtKzyHXQ7s9Of9S5D0bIaeXFT7/Z2eY22vXjsNWFVfgcMln10qfYm vg+EVCI0uhjLkzzHTIWTQok/lIKBzlD8zt8ia0spAiG7q775dYmkP3W16+aYwxbdkcD6 KO5Q== 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=X89jDaGowxydv3IxBOHofGRc/LRUGA8qaJv5vJJEJVY=; b=tUSoQh2EugP36lrXhJzJsJmtFIzIsYYndFNyPS3zECIOBlN3UqAdwELSujP4u9uqcM GH7mAxgus9VsX6yjtmR+8HvlIRti7Kv0SQWHc9N7IOGOBPQV0JANtd6+8tioAGl4DJeR TmV/TEzXlzpXZ9g2xPjHWWnCPI9JaPaORGs5IG+vtSIvWWzMJ2rSLnxiylsLdT4FlWEw Nw1cG20SAC61JGqPTvIMw3qui+GsF6IhLNSd0zgtbLWSLRsFeL1vxOWbQ0uSZykviKvt +baKaOnkjApnWp6I5IwlSOLhrJ05w/RRe8iTpNMYRV3oTjP+vdl1QbWZQGHMrkxL9j9w JLkA== X-Gm-Message-State: AJIora/oRzXP7vpdqp7yq3/22P3QW2lKLT1lxcb5NdN5/0EpBSf2vSp4 0WWlEQo5W9f6K8ZPLhY2ano= X-Google-Smtp-Source: AGRyM1txKGyzNMEuhzHcXfn5j6w5auIMxfTrFVAQ1+0tR5vwE9KQgYN9G+Evgqv3F8bDhAkYx40vOg== X-Received: by 2002:a17:907:e89:b0:72b:3059:a8c3 with SMTP id ho9-20020a1709070e8900b0072b3059a8c3mr12155332ejc.613.1657866556808; Thu, 14 Jul 2022 23:29:16 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb91.dynamic.kabel-deutschland.de. [95.90.187.145]) by smtp.gmail.com with ESMTPSA id ku5-20020a170907788500b007262a5e2204sm1614515ejc.153.2022.07.14.23.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 23:29:16 -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 2/5] staging: r8188eu: remove unused parameter from correct_TSF() Date: Fri, 15 Jul 2022 08:29:05 +0200 Message-Id: <20220715062908.8547-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220715062908.8547-1-straube.linux@gmail.com> References: <20220715062908.8547-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 parameter 'pmlmeext' of correct_TSF() is unused. Remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 0edcf84db16d..985cb3b4ba30 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6893,7 +6893,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) =20 if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_STATION_STATE) { /* correcting TSF */ - correct_TSF(padapter, pmlmeext); + correct_TSF(padapter); } rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_CONNECT, 0); } @@ -6908,7 +6908,7 @@ void mlmeext_sta_add_event_callback(struct adapter *p= adapter, struct sta_info *p /* nothing to do */ } else { /* adhoc client */ /* correcting TSF */ - correct_TSF(padapter, pmlmeext); + correct_TSF(padapter); =20 /* start beacon */ if (send_beacon(padapter) =3D=3D _FAIL) { diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index b48e0b9dfd7b..7b705e2ea04a 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1586,7 +1586,7 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *p= frame, uint len) pmlmeext->TSFValue |=3D le32_to_cpu(*pbuf); } =20 -void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext) +void correct_TSF(struct adapter *padapter) { SetHwReg8188EU(padapter, HW_VAR_CORRECT_TSF, NULL); } diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 28416d1bd15c..2110affc180f 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -597,7 +597,7 @@ bool cckrates_included(unsigned char *rate, int ratelen= ); bool cckratesonly_included(unsigned char *rate, int ratelen); =20 void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); -void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext); +void correct_TSF(struct adapter *padapter); =20 struct cmd_hdl { uint parmsize; --=20 2.37.0 From nobody Sat Apr 18 09:22:00 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 B170DC43334 for ; Fri, 15 Jul 2022 06:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231605AbiGOG3h (ORCPT ); Fri, 15 Jul 2022 02:29:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231530AbiGOG3T (ORCPT ); Fri, 15 Jul 2022 02:29:19 -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 B694513F86 for ; Thu, 14 Jul 2022 23:29:18 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id r18so5034835edb.9 for ; Thu, 14 Jul 2022 23:29:18 -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=2O/uYRshHQMHbYI/vornb8qnNhKEQ6GUPb1j3U9RmRc=; b=JqtQ96+vZsYrvnsILvvlOXUm1ha7+djdjKnUrDYm5ik2k+DyTbB4ZF1DSeeiaMx92f Ly9KrVsxE/ZRY8D17j3CRUmS5Hk0XpgqkHTVi1OyNh/yrhotEq88m1YKNyoApbFgbHMQ a7q/VUgrn3tUxVAhnlJ+Pk5ECgf6WrM8APoJHAHMVFgqQVRWDBn0y6QspKTKEd6UFldm oQ8drVOD2YmDfA56YwdOtMtue2DrkHC/uQpWNJ3qS5GwV8ynBxmQo6+jXn5SxYSe/EH9 aBn+eXcmaIOwNngZxBtatrD+ch3WNKi4sSsNmRULM/EbeYBTox5rV9TNjGr1ESAOmLxU Ee1Q== 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=2O/uYRshHQMHbYI/vornb8qnNhKEQ6GUPb1j3U9RmRc=; b=o0yB2/bSivd0oS2sYEKvIyzWkcDWqKAufcP004uGfSEvEO6mMf7vsJkvaEmvQp5V+9 315KNtSkDltXtHsGRLZgFTnIWM0bk242C91HRPFRub2OQBHDy6Letk7ArEze9rCbDpyl m7bPvxihZn+PjUjVpgtrqNzMbayK81QMY5x3YBLvdPGjYY9C7tJrmTfiyuR9Ux3m99jn yTPbdW+P33PusjleivT+fCyKootpYezcvpxARza0vVlOVOItbIXA/p+T/bAkdUNtWwON X8jMRsh7SlsS4vnqe0JNPN9VKh6dbj9uPqdVg1O+9LpMqTJAQjc6ll0ECUcjE2evxwY9 GsuQ== X-Gm-Message-State: AJIora/5TrHXA4gN2/bVg+SXG3HfP8VW9fLjwR7V81jxiOmW/iku0XBj Z8Eya/4+h2BSGPPJ8f2kkmc= X-Google-Smtp-Source: AGRyM1vL189/RM+6v4C21HG4ijWVy7NJ/WsAgm4+y1rD46JsLNH2Iqax5L0J8Q0UXPXR9bIYg4J50g== X-Received: by 2002:aa7:c650:0:b0:43a:2c9a:fd1f with SMTP id z16-20020aa7c650000000b0043a2c9afd1fmr16814000edr.318.1657866557369; Thu, 14 Jul 2022 23:29:17 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb91.dynamic.kabel-deutschland.de. [95.90.187.145]) by smtp.gmail.com with ESMTPSA id ku5-20020a170907788500b007262a5e2204sm1614515ejc.153.2022.07.14.23.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 23:29:17 -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 3/5] staging: r8188eu: remove unused parameter from update_TSF() Date: Fri, 15 Jul 2022 08:29:06 +0200 Message-Id: <20220715062908.8547-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220715062908.8547-1-straube.linux@gmail.com> References: <20220715062908.8547-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 parameter 'len' of update_TSF() is unused. Remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 985cb3b4ba30..c23be5d9eaaf 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -582,7 +582,7 @@ unsigned int OnBeacon(struct adapter *padapter, struct = recv_frame *precv_frame) pmlmeinfo->assoc_AP_vendor =3D check_assoc_AP(pframe + sizeof(struct ie= ee80211_hdr_3addr), len - sizeof(struct ieee80211_hdr_3addr)); =20 /* update TSF Value */ - update_TSF(pmlmeext, pframe, len); + update_TSF(pmlmeext, pframe); =20 /* start auth */ start_clnt_auth(padapter); @@ -625,7 +625,7 @@ unsigned int OnBeacon(struct adapter *padapter, struct = recv_frame *precv_frame) } =20 /* update TSF Value */ - update_TSF(pmlmeext, pframe, len); + update_TSF(pmlmeext, pframe); =20 /* report sta add event */ report_add_sta_event(padapter, GetAddr2Ptr(pframe), cam_idx); diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 7b705e2ea04a..9e920a320d71 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1571,7 +1571,7 @@ int update_sta_support_rate(struct adapter *padapter,= u8 *pvar_ie, uint var_ie_l return _SUCCESS; } =20 -void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) +void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe) { u8 *pIE; __le32 *pbuf; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 2110affc180f..54384b4c6b1a 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -596,7 +596,7 @@ void addba_timer_hdl(struct sta_info *psta); bool cckrates_included(unsigned char *rate, int ratelen); bool cckratesonly_included(unsigned char *rate, int ratelen); =20 -void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); +void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe); void correct_TSF(struct adapter *padapter); =20 struct cmd_hdl { --=20 2.37.0 From nobody Sat Apr 18 09:22:00 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 C6E23C433EF for ; Fri, 15 Jul 2022 06:29:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231630AbiGOG3k (ORCPT ); Fri, 15 Jul 2022 02:29:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231535AbiGOG3U (ORCPT ); Fri, 15 Jul 2022 02:29:20 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CD2D14D27 for ; Thu, 14 Jul 2022 23:29:19 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id dn9so7246007ejc.7 for ; Thu, 14 Jul 2022 23:29:19 -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=Y4Hu8b7EBTiadfTtEnPvDOCRgZybaDcXil1RG7XF6OY=; b=ONow5fB2vcsaJp8j56tTryta/5uItziKuyvgkpSP7ESV9V5gN69EpFc6y0R6Er88bP LMbXNPuCnyX279o8C1WioWbl9tgatsaTzDouH0B0dD+HCxiF+NsOvNCyJNfklvnTF77I qtN3zDrdc8FdkjqLAICOKPF7Q6E61ULFCl3KkA4XO7HjP/KfOkp6PW4VBOPHKtG/xwrl GG2rQt/7+FwtbX819GYEM/fK9nzkaNBklNj1Hpq5+UB+AKQn1v2epKUIWBiRGgBgvuk+ EWvFVEfKEwGEOvtUmhGlqaZKhOmPVRl2IwAIvMq8nrXMvk4Qo+CAmRPy0VQ/RH460pOC SjMg== 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=Y4Hu8b7EBTiadfTtEnPvDOCRgZybaDcXil1RG7XF6OY=; b=U3s9LcEV15KU6K4oyTMXLQ0QdMomzX8QS+bMcBHO0N4bXBBsI+dWyKvk0g6GB9ibEX dnqdQ5Tj5YW404PMgnHUY+rlwOMUVoxyk3c+folfxCPCe4ggwVkzTYKQwAXiMAZYs8aY bceE5NzOiPKG5J+5ON1whIE2d0JFvpQmSw9jITtZqjArklc+MC87e9iih9z7CqZOZ1nL d2xwZzFYudfhAdDZqfxnR0Vykqu6j83JNTFai3Za2HXGtdjhEGk8lQoaPZFTnr2FlA0s oS1UpEKJb40YyYn4IRKqc/78YtOUqgerVQi8Fm9/Gr+sc9p7A7Tj3ESHAm3rX/dpZq+4 nEWQ== X-Gm-Message-State: AJIora+9HXxmfS9JmsHjsSnuM78D4sYbBTSau7/USIJNo6kFKKvtP7Uo i0gQxrST0/cNLTSr5Tp2uSM= X-Google-Smtp-Source: AGRyM1vYPpY44y0QXNnch/6A5ygtFGZWhFnKkKfdA59ZFQ5aTgOGP2+Rq8XUE4wa0aZ8Zwwh/yFTyw== X-Received: by 2002:a17:907:9613:b0:72b:68df:8ada with SMTP id gb19-20020a170907961300b0072b68df8adamr12582278ejc.31.1657866557937; Thu, 14 Jul 2022 23:29:17 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb91.dynamic.kabel-deutschland.de. [95.90.187.145]) by smtp.gmail.com with ESMTPSA id ku5-20020a170907788500b007262a5e2204sm1614515ejc.153.2022.07.14.23.29.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 23:29:17 -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 4/5] staging: r8188eu: make update_TSF() and correct_TSF() static Date: Fri, 15 Jul 2022 08:29:07 +0200 Message-Id: <20220715062908.8547-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220715062908.8547-1-straube.linux@gmail.com> References: <20220715062908.8547-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 functions update_TSF() and correct_TSF() are only used in rtw_mlme_ext.c. Make them static. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 20 +++++++++++++++++++ drivers/staging/r8188eu/core/rtw_wlan_util.c | 20 ------------------- .../staging/r8188eu/include/rtw_mlme_ext.h | 3 --- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index c23be5d9eaaf..7b69d9ad75e9 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -428,6 +428,26 @@ static u32 p2p_listen_state_process(struct adapter *pa= dapter, unsigned char *da) return _SUCCESS; } =20 +static void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe) +{ + u8 *pIE; + __le32 *pbuf; + + pIE =3D pframe + sizeof(struct ieee80211_hdr_3addr); + pbuf =3D (__le32 *)pIE; + + pmlmeext->TSFValue =3D le32_to_cpu(*(pbuf + 1)); + + pmlmeext->TSFValue =3D pmlmeext->TSFValue << 32; + + pmlmeext->TSFValue |=3D le32_to_cpu(*pbuf); +} + +static void correct_TSF(struct adapter *padapter) +{ + SetHwReg8188EU(padapter, HW_VAR_CORRECT_TSF, NULL); +} + /*************************************************************************= *** =20 Following are the callback functions for each subtype of the management fr= ames diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 9e920a320d71..3a002cb6834f 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1571,26 +1571,6 @@ int update_sta_support_rate(struct adapter *padapter= , u8 *pvar_ie, uint var_ie_l return _SUCCESS; } =20 -void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe) -{ - u8 *pIE; - __le32 *pbuf; - - pIE =3D pframe + sizeof(struct ieee80211_hdr_3addr); - pbuf =3D (__le32 *)pIE; - - pmlmeext->TSFValue =3D le32_to_cpu(*(pbuf + 1)); - - pmlmeext->TSFValue =3D pmlmeext->TSFValue << 32; - - pmlmeext->TSFValue |=3D le32_to_cpu(*pbuf); -} - -void correct_TSF(struct adapter *padapter) -{ - SetHwReg8188EU(padapter, HW_VAR_CORRECT_TSF, NULL); -} - void beacon_timing_control(struct adapter *padapter) { SetBeaconRelatedRegisters8188EUsb(padapter); diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 54384b4c6b1a..bf952755ba35 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -596,9 +596,6 @@ void addba_timer_hdl(struct sta_info *psta); bool cckrates_included(unsigned char *rate, int ratelen); bool cckratesonly_included(unsigned char *rate, int ratelen); =20 -void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe); -void correct_TSF(struct adapter *padapter); - struct cmd_hdl { uint parmsize; u8 (*h2cfuns)(struct adapter *padapter, u8 *pbuf); --=20 2.37.0 From nobody Sat Apr 18 09:22:00 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 3D70CC433EF for ; Fri, 15 Jul 2022 06:29:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230224AbiGOG3p (ORCPT ); Fri, 15 Jul 2022 02:29:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231536AbiGOG3U (ORCPT ); Fri, 15 Jul 2022 02:29:20 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05DAA140C5 for ; Thu, 14 Jul 2022 23:29:20 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id mf4so7280119ejc.3 for ; Thu, 14 Jul 2022 23:29:19 -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=Xl+9oCMh/oqt2tTlhq3WUAuzJWvvAJxxxxNs123bVL0=; b=WNJrl8Yb7jU5xqrl9zVMUpjWvPC+5VA+DCLSr1nXlR10FFd1a0ZtA95scWQL370jtH CtPJlpqRqJx44KmaKeQuYtunaDhyBZsa2BsT8YqPXbruY4JcTGjUTInh3a3LlSR80QTX R5V6NUvNwTw8klIqvxLaZ/MV1SKwzWVcGQ/T7nNSwHrhYADv6srARp9PiVBEcPzXsqMe TCz5Dm4iZyK9uhonK313EnztTE0MTGtp4eD2RYsMdwk6bqnPsUceY9OEqvpvF0tL8qaA p1AhBQV3kOx1zA5W1cLd4KB0qAqJUlV0Dt4MB04xVnyP6jVprwwrbAFtAIDbT4PqFz58 nKUA== 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=Xl+9oCMh/oqt2tTlhq3WUAuzJWvvAJxxxxNs123bVL0=; b=7LAok8KpmZTcTKD1WPLHq0NCnjPspraUvfH2wg49oi744kvYhh3TIygGjdgQPakASo WSiXEsJh8O7IpJ+aDo83Bgp9phtm1Fay+CXz36a3MbTpd3NCDkS0/ufOeLkTLo3mgbDQ sYKvkQSGOhjItcwR7GmB9wGvB8CC86uwMkrw/tk5jkcvHj5QgU1doGX49f34jboerVzL zaLso9/pzP0cr1TiMaAjfkNDhcPHR/Ya/+h8L2MrQWbBQm2Z9za5+Eizq/ea6xYPNrlj JLISxLz+TWUC3zkVvbDoQRmBl+v10pIvv7wLmsGmJMQvB+huBAFz4OJ8o2Bcx/o1gWRC 4ZNQ== X-Gm-Message-State: AJIora/B/i5mAKwmYjeWV151kZkdNtAoXhIsCA55Jf4thUcKRk31ebwl 1zg3n1i5VwKA+3f4MgaIvf9dGxIME/4= X-Google-Smtp-Source: AGRyM1tAwn7SmZWIPPGC/IQhUsjZiFUtaEwVj4JJtrNLpkmBdf+W7GbVfeZPOpFQrg5dY23KrQnUGQ== X-Received: by 2002:a17:907:2be9:b0:72b:50b8:82d6 with SMTP id gv41-20020a1709072be900b0072b50b882d6mr2608093ejc.677.1657866558549; Thu, 14 Jul 2022 23:29:18 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb91.dynamic.kabel-deutschland.de. [95.90.187.145]) by smtp.gmail.com with ESMTPSA id ku5-20020a170907788500b007262a5e2204sm1614515ejc.153.2022.07.14.23.29.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 23:29:18 -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 5/5] staging: r8188eu: remove SetHwReg8188EU() Date: Fri, 15 Jul 2022 08:29:08 +0200 Message-Id: <20220715062908.8547-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220715062908.8547-1-straube.linux@gmail.com> References: <20220715062908.8547-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 the case HW_VAR_CORRECT_TSF from SetHwReg8188EU() and move the functionality to the function that calls SetHwReg8188EU() with HW_VAR_CORRECT_TSF. SetHwReg8188EU() is empty now and we can finally remove it. Signed-off-by: Michael Straube Tested-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 34 +++++++++++++++- drivers/staging/r8188eu/hal/usb_halinit.c | 45 --------------------- drivers/staging/r8188eu/include/hal_intf.h | 6 --- 3 files changed, 33 insertions(+), 52 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 7b69d9ad75e9..32d0e101d0c2 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -445,7 +445,39 @@ static void update_TSF(struct mlme_ext_priv *pmlmeext,= u8 *pframe) =20 static void correct_TSF(struct adapter *padapter) { - SetHwReg8188EU(padapter, HW_VAR_CORRECT_TSF, NULL); + u8 reg; + int res; + u64 tsf; + struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; + + tsf =3D pmlmeext->TSFValue - do_div(pmlmeext->TSFValue, + pmlmeinfo->bcn_interval * 1024) - 1024; /* us */ + + if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || + ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) + rtw_stop_tx_beacon(padapter); + + /* disable related TSF function */ + res =3D rtw_read8(padapter, REG_BCN_CTRL, ®); + if (res) + return; + + rtw_write8(padapter, REG_BCN_CTRL, reg & (~BIT(3))); + + rtw_write32(padapter, REG_TSFTR, tsf); + rtw_write32(padapter, REG_TSFTR + 4, tsf >> 32); + + /* enable related TSF function */ + res =3D rtw_read8(padapter, REG_BCN_CTRL, ®); + if (res) + return; + + rtw_write8(padapter, REG_BCN_CTRL, reg | BIT(3)); + + if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || + ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) + rtw_resume_tx_beacon(padapter); } =20 /*************************************************************************= *** diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index b8fd73ac8f7c..ff074d246dab 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -963,51 +963,6 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter) kfree(efuse_buf); } =20 -void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) -{ - u8 reg; - int res; - - switch (variable) { - case HW_VAR_CORRECT_TSF: - { - u64 tsf; - struct mlme_ext_priv *pmlmeext =3D &Adapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; - - tsf =3D pmlmeext->TSFValue - do_div(pmlmeext->TSFValue, - pmlmeinfo->bcn_interval * 1024) - 1024; /* us */ - - if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || ((pmlmein= fo->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) - rtw_stop_tx_beacon(Adapter); - - /* disable related TSF function */ - res =3D rtw_read8(Adapter, REG_BCN_CTRL, ®); - if (res) - return; - - rtw_write8(Adapter, REG_BCN_CTRL, reg & (~BIT(3))); - - rtw_write32(Adapter, REG_TSFTR, tsf); - rtw_write32(Adapter, REG_TSFTR + 4, tsf >> 32); - - /* enable related TSF function */ - res =3D rtw_read8(Adapter, REG_BCN_CTRL, ®); - if (res) - return; - - rtw_write8(Adapter, REG_BCN_CTRL, reg | BIT(3)); - - if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || ((pmlmein= fo->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) - rtw_resume_tx_beacon(Adapter); - } - break; - default: - break; - } - -} - void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_le= vel) { u8 init_rate =3D 0; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index e1dfd621a5cb..ab6856d8a090 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -8,10 +8,6 @@ #include "drv_types.h" #include "Hal8188EPhyCfg.h" =20 -enum hw_variables { - HW_VAR_CORRECT_TSF, -}; - typedef s32 (*c2h_id_filter)(u8 id); =20 void rtl8188eu_interface_configure(struct adapter *adapt); @@ -32,8 +28,6 @@ int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, =20 unsigned int rtl8188eu_inirp_init(struct adapter *Adapter); =20 -void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val); - uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); void rtw_hal_stop(struct adapter *padapter); --=20 2.37.0