From nobody Mon May 11 08:30:27 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 11159C433EF for ; Sat, 9 Apr 2022 12:07:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241705AbiDIMIz (ORCPT ); Sat, 9 Apr 2022 08:08:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232397AbiDIMIt (ORCPT ); Sat, 9 Apr 2022 08:08:49 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C1931706F for ; Sat, 9 Apr 2022 05:06:42 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id z99so4204576ede.5 for ; Sat, 09 Apr 2022 05:06:42 -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=e2l4+TzWynqdn+GbmcVMBPCWsygQ6XPirUeVvI7JC2s=; b=JkrmEPriyHhrdIUJKSEF689S9aXzzAkOVE38FBavP/SuTci3QFCqq8N3Goh8ahf0ii 3aaG3YRItNrHzlnXWAqXiUtSk18LcuCwuSkrQcnduxDCGhljgKzPL6rH1WTXI0OsATAQ nbe/ngKerMefy0Fy+IUD+vevZQxjva/51Fsz3Z5swwISeMbG6H5PZkmKKr2d7CPp7eEL GE3C/QONUJ0WggSG1+9G/SLjXY+Dh0pB2RXoWrCpq3wG/OH8qxDv0GdflXaSMwDnFyVp gmMGEOHv0lvySEgivuM5Yw7tBv1teHlmwmXn2UEk+QyD+zCn504Qmb2xzndEk617XZEr n09Q== 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=e2l4+TzWynqdn+GbmcVMBPCWsygQ6XPirUeVvI7JC2s=; b=1J6gpw0Cya7ZXWiMFxNacq5N0oxmIbT7tbk3jpRYHkdXdR1f/BH3TsocMlMsFMVESS ftWLSwmE943H4+VA0tfJbfcpurHFzUNXVf94voNabYLsnjWAJPBn+F925X72FOTrOuCU p803qWitutizEwQJup0mJuRmW6s/9mHkTghZfle9vWHhK3oFxTU2Wmvwag9Mia+eL0i3 D69UTvxeDdiTRpNGDIZyk8DT3SvhtD18BBVItwru5aNA/0RDaiCOhydE1+XR57G5pNAm viWeAQsipOxb5rrjovC7d4JN5GNMXpzE7N4RSL9ErDs9CQsmVl+RqMvGF9VLFMfbNljL 3isA== X-Gm-Message-State: AOAM5306X24exANZqWAWjrmfRitOQu1Awh5LXGRySLGZbSuNO+SqFErv qwUNVBpr1VfTIOSxwUXOv4EYkn0JJtQ= X-Google-Smtp-Source: ABdhPJz1xHYk56YMm2DLOOnZRqJ7LJZW3TNEd7EYzFHHo5+hUKIlwHdGC9jjzmlbQdJxho0CbYJaVA== X-Received: by 2002:a05:6402:6c1:b0:41d:6043:22ea with SMTP id n1-20020a05640206c100b0041d604322eamr4439096edy.332.1649506000889; Sat, 09 Apr 2022 05:06:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id z21-20020a170906435500b006e8669fae36sm1102947ejm.189.2022.04.09.05.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 05:06:40 -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/4] staging: r8188eu: remove HW_VAR_INITIAL_GAIN Date: Sat, 9 Apr 2022 14:06:24 +0200 Message-Id: <20220409120627.10633-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409120627.10633-1-straube.linux@gmail.com> References: <20220409120627.10633-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_INITIAL_GAIN case from SetHwReg8188EU() and move its functionality to a new static function in rtw_mlme_ext.c. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 30 ++++++++++++++------- drivers/staging/r8188eu/hal/usb_halinit.c | 13 --------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 474391bf7cb5..e7fffd56196c 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5794,13 +5794,27 @@ Following are some utitity fuctions for WiFi MLME =20 **************************************************************************= ***/ =20 +static void rtw_set_initial_gain(struct adapter *adapter, u8 gain) +{ + struct hal_data_8188e *haldata =3D &adapter->haldata; + struct odm_dm_struct *odmpriv =3D &haldata->odmpriv; + struct rtw_dig *digtable =3D &odmpriv->DM_DigTable; + + if (gain =3D=3D 0xff) { + /* restore rx gain */ + ODM_Write_DIG(odmpriv, digtable->BackupIGValue); + } else { + digtable->BackupIGValue =3D digtable->CurIGValue; + ODM_Write_DIG(odmpriv, gain); + } +} + void site_survey(struct adapter *padapter) { unsigned char survey_channel =3D 0, val8; enum rt_scan_type ScanType =3D SCAN_PASSIVE; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; - u32 initialgain =3D 0; struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; =20 if ((pwdinfo->rx_invitereq_info.scan_op_ch_only) || (pwdinfo->p2p_info.sc= an_op_ch_only)) { @@ -5878,8 +5892,8 @@ void site_survey(struct adapter *padapter) rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_LISTEN); pmlmeext->sitesurvey_res.state =3D SCAN_DISABLE; =20 - initialgain =3D 0xff; /* restore RX GAIN */ - SetHwReg8188EU(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); + /* restore RX GAIN */ + rtw_set_initial_gain(padapter, 0xff); /* turn on dynamic functions */ Restore_DM_Func_Flag(padapter); /* Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FU= NC_SS, true); */ @@ -5912,8 +5926,8 @@ void site_survey(struct adapter *padapter) /* config MSR */ Set_MSR(padapter, (pmlmeinfo->state & 0x3)); =20 - initialgain =3D 0xff; /* restore RX GAIN */ - SetHwReg8188EU(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); + /* restore RX GAIN */ + rtw_set_initial_gain(padapter, 0xff); /* turn on dynamic functions */ Restore_DM_Func_Flag(padapter); /* Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); */ @@ -7369,7 +7383,6 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *p= buf) struct sitesurvey_parm *pparm =3D (struct sitesurvey_parm *)pbuf; u8 bdelayscan =3D false; u8 val8; - u32 initialgain; u32 i; struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; =20 @@ -7418,11 +7431,10 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 = *pbuf) =20 /* config the initial gain under scanning, need to write the BB register= s */ if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) - initialgain =3D 0x1E; + rtw_set_initial_gain(padapter, 0x1e); else - initialgain =3D 0x28; + rtw_set_initial_gain(padapter, 0x28); =20 - SetHwReg8188EU(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); =20 /* set MSR to no link state */ Set_MSR(padapter, _HW_STATE_NOLINK_); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 5cbb982505a8..d8aea49afe8b 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1146,19 +1146,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) rtl8188e_set_FwPwrMode_cmd(Adapter, psmode); } break; - case HW_VAR_INITIAL_GAIN: - { - struct rtw_dig *pDigTable =3D &podmpriv->DM_DigTable; - u32 rx_gain =3D ((u32 *)(val))[0]; - - if (rx_gain =3D=3D 0xff) {/* restore rx gain */ - ODM_Write_DIG(podmpriv, pDigTable->BackupIGValue); - } else { - pDigTable->BackupIGValue =3D pDigTable->CurIGValue; - ODM_Write_DIG(podmpriv, rx_gain); - } - } - break; case HW_VAR_FIFO_CLEARN_UP: { struct pwrctrl_priv *pwrpriv =3D &Adapter->pwrctrlpriv; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 532d02bba9f8..342587e05468 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -22,7 +22,6 @@ enum hw_variables { HW_VAR_AC_PARAM_BE, HW_VAR_AMPDU_FACTOR, HW_VAR_H2C_FW_PWRMODE, - HW_VAR_INITIAL_GAIN, HW_VAR_FIFO_CLEARN_UP, HW_VAR_H2C_MEDIA_STATUS_RPT, }; --=20 2.35.1 From nobody Mon May 11 08:30:27 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 20842C4332F for ; Sat, 9 Apr 2022 12:07:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241711AbiDIMI7 (ORCPT ); Sat, 9 Apr 2022 08:08:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241695AbiDIMIu (ORCPT ); Sat, 9 Apr 2022 08:08:50 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 817221CFF3 for ; Sat, 9 Apr 2022 05:06:43 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id r13so22078809ejd.5 for ; Sat, 09 Apr 2022 05:06:43 -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=7utODHfqNjFzBMcklrG5MwYZkbXf2tzkjHzM6VBpQUQ=; b=IIuqOEvRFRNQehMFjmPbMSnr0s65rsfp8K7MYmppfqDi0djoDchuJ6q1SI3rUOO1HS wgLBWTxXmf+K0r0fxjk2S/9WP2T/+fmBAXpCnhycCcbSAe1sZzChJnQmBJpI1Sk1/eGm ETFMHFamvZsXsSqEnNwshjIHSHgiviRZiYFT4VrYFj/deQTi2ZEikM471wX88zShCybq z8XSSx98DieUUUyAeEMj3n5keFoUA6Ulye6+ideEop4fkVBMyYoSgFV2ey5EZ4xtEjAF RLIYXqKGJyf3JX2sN+PfvuDbcuSFftw/3nFzISpw0rn39UwisnlCkMxFyXHbU6FNdNK8 Mt+Q== 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=7utODHfqNjFzBMcklrG5MwYZkbXf2tzkjHzM6VBpQUQ=; b=EPmWRypl7idnSaFedrbnhqajGFWXGuxI0/sncEVtsUndsv2YDsh/I+S4ZbV/I/Zev6 RRPBiYceJ5G+Rhcv85m7SR2biIwTyDnvVvGDA4sU1IHp2Mj0YuljracJmDBbH88AY3kS XP+sGO3VRZyZ+9nc39tqZ5AGu+ubxwagfhqbE71rVD51+cj5+eONOtgO69Es0XK36z8Y ajy6XCj4LRj2cO9+Ab16JHf8rAcZOakUu1gWLvX0TBe3LZDSRQz3xN50E1NRXWTAaKJl o1u1nfG4svBgOGLTMv5NtbkLwsiBIp8rrr48XpGB0hMZOHBF6I2yqJHeVGrihbQQ+5UW vAhA== X-Gm-Message-State: AOAM530GM7TzUjjVBgJq6y+/f69IXyvIyxNgFFDobqqYPt2DoGl6V5/j iRTtI9kmWb7ujspXF+8Xkn8= X-Google-Smtp-Source: ABdhPJx2ic4EoFvHCuGvDgmzF4mgZW3Os4tY9v1BQi+salNZIEAZqK+wCKlCkQPN3hKtQ/egVkIf+Q== X-Received: by 2002:a17:906:7316:b0:6d7:16be:b584 with SMTP id di22-20020a170906731600b006d716beb584mr22088865ejc.759.1649506002071; Sat, 09 Apr 2022 05:06:42 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id z21-20020a170906435500b006e8669fae36sm1102947ejm.189.2022.04.09.05.06.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 05:06:41 -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/4] staging: r8188eu: remove HW_VAR_MLME_JOIN Date: Sat, 9 Apr 2022 14:06:25 +0200 Message-Id: <20220409120627.10633-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409120627.10633-1-straube.linux@gmail.com> References: <20220409120627.10633-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_MLME_JOIN case from SetHwReg8188EU() and move its functionality to a new static function in rtw_mlme_ext.c. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 61 ++++++++++++++++----- drivers/staging/r8188eu/hal/usb_halinit.c | 30 ---------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index e7fffd56196c..31192b287698 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6110,10 +6110,50 @@ static void rtw_set_bssid(struct adapter *adapter, = u8 *bssid) rtw_write8(adapter, REG_BSSID + i, bssid[i]); } =20 +static void mlme_join(struct adapter *adapter, int type) +{ + struct mlme_priv *mlmepriv =3D &adapter->mlmepriv; + u8 retry_limit =3D 0x30; + + switch (type) { + case 0: + /* prepare to join */ + /* enable to rx data frame, accept all data frame */ + rtw_write16(adapter, REG_RXFLTMAP2, 0xFFFF); + + rtw_write32(adapter, REG_RCR, + rtw_read32(adapter, REG_RCR) | RCR_CBSSID_DATA | RCR_CBSSID_BCN); + + if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) { + retry_limit =3D 48; + } else { + /* ad-hoc mode */ + retry_limit =3D 0x7; + } + break; + case 1: + /* joinbss_event call back when join res < 0 */ + rtw_write16(adapter, REG_RXFLTMAP2, 0x00); + break; + case 2: + /* sta add event call back */ + /* enable update TSF */ + rtw_write8(adapter, REG_BCN_CTRL, rtw_read8(adapter, REG_BCN_CTRL) & (~B= IT(4))); + + if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE)) + retry_limit =3D 0x7; + break; + default: + break; + } + + rtw_write16(adapter, REG_RL, + retry_limit << RETRY_LIMIT_SHORT_SHIFT | retry_limit << RETRY_LIMIT_= LONG_SHIFT); +} + void start_create_ibss(struct adapter *padapter) { unsigned short caps; - u8 join_type; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; struct wlan_bssid_ex *pnetwork =3D (struct wlan_bssid_ex *)(&pmlmeinfo->n= etwork); @@ -6145,8 +6185,7 @@ void start_create_ibss(struct adapter *padapter) pmlmeinfo->state =3D WIFI_FW_NULL_STATE; } else { rtw_set_bssid(padapter, padapter->registrypriv.dev_network.MacAddress); - join_type =3D 0; - SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); + mlme_join(padapter, 0); =20 report_join_res(padapter, 1); pmlmeinfo->state |=3D WIFI_FW_ASSOC_SUCCESS; @@ -6719,12 +6758,10 @@ void mlmeext_joinbss_event_callback(struct adapter = *padapter, int join_res) struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; struct wlan_bssid_ex *cur_network =3D &pmlmeinfo->network; struct sta_priv *pstapriv =3D &padapter->stapriv; - u8 join_type; u16 media_status; =20 if (join_res < 0) { - join_type =3D 1; - SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); + mlme_join(padapter, 1); rtw_set_bssid(padapter, null_addr); =20 /* restore to initial setting. */ @@ -6779,8 +6816,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) SetHwReg8188EU(padapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_statu= s); } =20 - join_type =3D 2; - SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); + mlme_join(padapter, 2); =20 if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_STATION_STATE) { /* correcting TSF */ @@ -6793,7 +6829,6 @@ void mlmeext_sta_add_event_callback(struct adapter *p= adapter, struct sta_info *p { struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; - u8 join_type; =20 if ((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) { if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {/* adhoc master or sta_co= unt>1 */ @@ -6810,9 +6845,7 @@ void mlmeext_sta_add_event_callback(struct adapter *p= adapter, struct sta_info *p } pmlmeinfo->state |=3D WIFI_FW_ASSOC_SUCCESS; } - - join_type =3D 2; - SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); + mlme_join(padapter, 2); } =20 pmlmeinfo->FW_sta_info[psta->mac_id].psta =3D psta; @@ -7183,7 +7216,6 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) =20 u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) { - u8 join_type; struct ndis_802_11_var_ie *pIE; struct registry_priv *pregpriv =3D &padapter->registrypriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; @@ -7281,8 +7313,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) /* config the initial gain under linking, need to write the BB registers = */ =20 rtw_set_bssid(padapter, pmlmeinfo->network.MacAddress); - join_type =3D 0; - SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); + mlme_join(padapter, 0); =20 /* cancel link timer */ _cancel_timer_ex(&pmlmeext->link_timer); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index d8aea49afe8b..e50d47bf1f0f 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1036,36 +1036,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID= _BCN); } break; - case HW_VAR_MLME_JOIN: - { - u8 RetryLimit =3D 0x30; - u8 type =3D *((u8 *)val); - struct mlme_priv *pmlmepriv =3D &Adapter->mlmepriv; - - if (type =3D=3D 0) { /* prepare to join */ - /* enable to rx data frame.Accept all data frame */ - rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF); - - rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSI= D_DATA | RCR_CBSSID_BCN); - - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) - RetryLimit =3D 48; - else /* Ad-hoc Mode */ - RetryLimit =3D 0x7; - } else if (type =3D=3D 1) { - /* joinbss_event call back when join res < 0 */ - rtw_write16(Adapter, REG_RXFLTMAP2, 0x00); - } else if (type =3D=3D 2) { - /* sta add event call back */ - /* enable update TSF */ - rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL) & (= ~BIT(4))); - - if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STAT= E)) - RetryLimit =3D 0x7; - } - rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | Re= tryLimit << RETRY_LIMIT_LONG_SHIFT); - } - break; case HW_VAR_SLOT_TIME: { u8 u1bAIFS, aSifsTime; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 342587e05468..42d5aafbb32a 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -13,7 +13,6 @@ enum hw_variables { HW_VAR_BASIC_RATE, HW_VAR_CORRECT_TSF, HW_VAR_MLME_SITESURVEY, - HW_VAR_MLME_JOIN, HW_VAR_SLOT_TIME, HW_VAR_DM_FLAG, HW_VAR_DM_FUNC_OP, --=20 2.35.1 From nobody Mon May 11 08:30:27 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 E6840C433F5 for ; Sat, 9 Apr 2022 12:07:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241723AbiDIMJC (ORCPT ); Sat, 9 Apr 2022 08:09:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241698AbiDIMIw (ORCPT ); Sat, 9 Apr 2022 08:08:52 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F55D60C8 for ; Sat, 9 Apr 2022 05:06:44 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id t25so137237edt.9 for ; Sat, 09 Apr 2022 05:06:44 -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=sL45mKNoTqnnk6QANCD/gP//tD3yOWqa4ItmJXFVefk=; b=XFCwvzZ3cY/7Mv88ITvYg0x1nn4/dfRj4XKaZEgFd2jIn4ppYOdCuxG3+y3qqKuvsC 9LdsnS7Xi0QFz5qaheAyHhsymhewv+7cOnAYbqAZSsYLgk+WDf8TF0AdotG8d3u144cT /Eo/SgxhL1R1FrzoR4xaZORxIRjtrSRSbyL+Snt3pJmjrUx3pzL+2zuWOurhsDM3/kor rZoj9aTaL5B8kmDb68y88UX7IZHq6CShJJW1VQLRYBWiktxm3knmsA/nR6j8a0mtv2lA m4FyNZnOsWwv2bwcX7ke8YI4M9m/fX6fN3tMc848IMzo7+oEWsx5h0UgHjq59G6SVQwA uLwA== 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=sL45mKNoTqnnk6QANCD/gP//tD3yOWqa4ItmJXFVefk=; b=ZoT6vqtjATgpMnIjKBrVyEhZeZKtdhPtESN6PRpdi271oczF9JFWeqk0ddnTJ0RRaf 2Y7hrboDEIJkA+Cg6PvSInQM4Nys0mWX1tg51x5iRhZWnrNInyULL05iceQS8RZRXBxC Xfb9nrrKitGmM9LeOICYA1AI/K0SQWjyi5ddY7MJBqpHeRdfg+VWzJ+ECgJl54y+5z2V yqN0NN0tfn07muxac7kEiTTUewSyWSGVK6Fyu8nvaZ3XgYAVZ79+2AhcIPTo4DvlS6eN wTOgPamrprhbfqsOAC1Aw3pLs1MBYMTWu7u73Z12UazgsaKjoDEX6bpnKAFE0KBlg6NI thoQ== X-Gm-Message-State: AOAM530pWKnqyv/nKFuocEXNlsla9vrxg0XF06RKVfhlveqPV+mBebIo 5y9m061py0isa2rKMBsRPxo= X-Google-Smtp-Source: ABdhPJy4MRAFo0KUaEnBSUApDBM0F0zws6Yy4/9oHx2G85uHH2HOczhKfUiSc0+KfOSJ4X2iKyzcwQ== X-Received: by 2002:a05:6402:40c4:b0:419:135b:83ac with SMTP id z4-20020a05640240c400b00419135b83acmr23953710edb.321.1649506003252; Sat, 09 Apr 2022 05:06:43 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id z21-20020a170906435500b006e8669fae36sm1102947ejm.189.2022.04.09.05.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 05:06:42 -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/4] staging: r8188eu: remove HW_VAR_FIFO_CLEARN_UP Date: Sat, 9 Apr 2022 14:06:26 +0200 Message-Id: <20220409120627.10633-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409120627.10633-1-straube.linux@gmail.com> References: <20220409120627.10633-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_FIFO_CLEARN_UP case from SetHwReg8188EU() and move its functionality to a new static function in os_intfs.c. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 26 ------------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 29 +++++++++++++++++++++- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index e50d47bf1f0f..62ada1790d0d 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1116,32 +1116,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) rtl8188e_set_FwPwrMode_cmd(Adapter, psmode); } break; - case HW_VAR_FIFO_CLEARN_UP: - { - struct pwrctrl_priv *pwrpriv =3D &Adapter->pwrctrlpriv; - u8 trycnt =3D 100; - - /* pause tx */ - rtw_write8(Adapter, REG_TXPAUSE, 0xff); - - /* keep sn */ - Adapter->xmitpriv.nqos_ssn =3D rtw_read16(Adapter, REG_NQOS_SEQ); - - if (!pwrpriv->bkeepfwalive) { - /* RX DMA stop */ - rtw_write32(Adapter, REG_RXPKT_NUM, (rtw_read32(Adapter, REG_RXPKT_NUM= ) | RW_RELEASE_EN)); - do { - if (!(rtw_read32(Adapter, REG_RXPKT_NUM) & RXDMA_IDLE)) - break; - } while (trycnt--); - - /* RQPN Load 0 */ - rtw_write16(Adapter, REG_RQPN_NPQ, 0x0); - rtw_write32(Adapter, REG_RQPN, 0x80000000); - mdelay(10); - } - } - break; case HW_VAR_H2C_MEDIA_STATUS_RPT: rtl8188e_set_FwMediaStatus_cmd(Adapter, (*(__le16 *)val)); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 42d5aafbb32a..bbbdcfa253f8 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -21,7 +21,6 @@ enum hw_variables { HW_VAR_AC_PARAM_BE, HW_VAR_AMPDU_FACTOR, HW_VAR_H2C_FW_PWRMODE, - HW_VAR_FIFO_CLEARN_UP, HW_VAR_H2C_MEDIA_STATUS_RPT, }; =20 diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 390d1cc0ecb0..891c85b088ca 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -736,9 +736,36 @@ void rtw_ips_pwr_down(struct adapter *padapter) padapter->bCardDisableWOHSM =3D false; } =20 +static void rtw_fifo_cleanup(struct adapter *adapter) +{ + struct pwrctrl_priv *pwrpriv =3D &adapter->pwrctrlpriv; + u8 trycnt =3D 100; + + /* pause tx */ + rtw_write8(adapter, REG_TXPAUSE, 0xff); + + /* keep sn */ + adapter->xmitpriv.nqos_ssn =3D rtw_read16(adapter, REG_NQOS_SEQ); + + if (!pwrpriv->bkeepfwalive) { + /* RX DMA stop */ + rtw_write32(adapter, REG_RXPKT_NUM, + (rtw_read32(adapter, REG_RXPKT_NUM) | RW_RELEASE_EN)); + do { + if (!(rtw_read32(adapter, REG_RXPKT_NUM) & RXDMA_IDLE)) + break; + } while (trycnt--); + + /* RQPN Load 0 */ + rtw_write16(adapter, REG_RQPN_NPQ, 0x0); + rtw_write32(adapter, REG_RQPN, 0x80000000); + mdelay(10); + } +} + void rtw_ips_dev_unload(struct adapter *padapter) { - SetHwReg8188EU(padapter, HW_VAR_FIFO_CLEARN_UP, NULL); + rtw_fifo_cleanup(padapter); =20 if (padapter->intf_stop) padapter->intf_stop(padapter); --=20 2.35.1 From nobody Mon May 11 08:30:27 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 01A88C433FE for ; Sat, 9 Apr 2022 12:07:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241727AbiDIMJH (ORCPT ); Sat, 9 Apr 2022 08:09:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241700AbiDIMIx (ORCPT ); Sat, 9 Apr 2022 08:08:53 -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 E84161CFF3 for ; Sat, 9 Apr 2022 05:06:45 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id lc2so1489827ejb.12 for ; Sat, 09 Apr 2022 05:06:45 -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=XCtUqRrEnchiPWI+Bdu07xbyLJ9MlyKU90+iSNkqkHY=; b=XoOiZs6flNAATBJYW0ZZn1e+wtyIFq9WPmB8liXAtCxAuv+i4q45RTaqE7v3vD/WX8 n6Xzn0rTpRTHLMULDqMxX87HsyDZTAGeyfb+b+0RtGEwPx/t0E1ppT7oZ1k1DcQUqxQB 7lxwoz7OD2o1xZo4QjaEK2JyIGDx1qThT4lP+0brzaL47K2ovC0N9usyQNs+qS4YrvsR fzmHQ4qKbQp8Ip/rZ4jEMXKZSiheGwURvQrZOEctGyiMmX/GXwor/3GUnM2lK5WvxDJi N9xtVg6wwLqulD6x3WgtDCXpiFCsR4hDigTur5J0qQS8XlVQtoHuCPHHwhyVhTBGEbdG ni8g== 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=XCtUqRrEnchiPWI+Bdu07xbyLJ9MlyKU90+iSNkqkHY=; b=SexKpynD5Wvw82GWhw19JUdcPB7Djc2lJVMfquMSGTEhLHFdhdyrEcGK6fCdgy1zR+ aXkFZ2YKfNn9LIbfIT3dCSp1GHcKacwh8xW3EJ3fMR9SFoxGrDX9TrPHXLY03bXB07So VjasxDS366gk7LJaA1pwtxEQSYmhf0fzfBcrxQxVqWuokmKrIuplmkaRrE0edtndPPT2 Q/exust2uh0nU6Byl1c0eASqPpjfOOjEf2vTYNerBjunDRSGaw+6d4elA5BgJOoQTSm8 BF6ZFpL0NXHj23C0CI7x284xkO3+KO049GUeqiZz2hB4wvlldsCYzB2jhl0iKV9EfRV7 wvhw== X-Gm-Message-State: AOAM5331GDFHxFRhWABMUMPxxzEq+yzi/SWl823uh/N498rNdkigohOw 8sOESSnG81x9C892xxUt6N0= X-Google-Smtp-Source: ABdhPJyiLtNkrp2mgy73ZRqRIwZjT+QMcCLCpJtpQnpMSu3R92QnK5dInXKGVPT76kX4wDe0yZkOCw== X-Received: by 2002:a17:906:6a02:b0:6d7:cda:2cf7 with SMTP id qw2-20020a1709066a0200b006d70cda2cf7mr21560386ejc.53.1649506004464; Sat, 09 Apr 2022 05:06:44 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id z21-20020a170906435500b006e8669fae36sm1102947ejm.189.2022.04.09.05.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 05:06:43 -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/4] staging: r8188eu: remove HW_VAR_H2C_FW_PWRMODE Date: Sat, 9 Apr 2022 14:06:27 +0200 Message-Id: <20220409120627.10633-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409120627.10633-1-straube.linux@gmail.com> References: <20220409120627.10633-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_H2C_FW_PWRMODE case from SetHwReg8188EU() and move its functionality to a new function in rtw_pwrctrl.c. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_p2p.c | 4 ++-- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 19 +++++++++++++++---- drivers/staging/r8188eu/hal/usb_halinit.c | 11 ----------- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 + 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188= eu/core/rtw_p2p.c index 80305d128ccd..dcf828a57179 100644 --- a/drivers/staging/r8188eu/core/rtw_p2p.c +++ b/drivers/staging/r8188eu/core/rtw_p2p.c @@ -1612,7 +1612,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_p= s_state) if (padapter->pwrctrlpriv.bFwCurrentInPSMode) { if (pwrpriv->smart_ps =3D=3D 0) { pwrpriv->smart_ps =3D 2; - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&padapter->pwrc= trlpriv.pwr_mode)); + rtw_set_firmware_ps_mode(padapter, pwrpriv->pwr_mode); } } break; @@ -1623,7 +1623,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_p= s_state) if (pwdinfo->ctwindow > 0) { if (pwrpriv->smart_ps !=3D 0) { pwrpriv->smart_ps =3D 0; - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&padapter->pwr= ctrlpriv.pwr_mode)); + rtw_set_firmware_ps_mode(padapter, pwrpriv->pwr_mode); } } rtl8188e_set_p2p_ps_offload_cmd(padapter, p2p_ps_state); diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r= 8188eu/core/rtw_pwrctrl.c index efdc7de49d49..f13bd5cdaa23 100644 --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c @@ -176,6 +176,19 @@ static bool PS_RDY_CHECK(struct adapter *padapter) return true; } =20 +void rtw_set_firmware_ps_mode(struct adapter *adapter, u8 mode) +{ + struct hal_data_8188e *haldata =3D &adapter->haldata; + struct odm_dm_struct *odmpriv =3D &haldata->odmpriv; + + /* Force leave RF low power mode for 1T1R to prevent + * conflicting setting in firmware power saving sequence. + */ + if (mode !=3D PS_MODE_ACTIVE) + ODM_RF_Saving(odmpriv, true); + rtl8188e_set_FwPwrMode_cmd(adapter, mode); +} + void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8= bcn_ant_mode) { struct pwrctrl_priv *pwrpriv =3D &padapter->pwrctrlpriv; @@ -193,11 +206,10 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_= mode, u8 smart_ps, u8 bcn_a return; } =20 - /* if (pwrpriv->pwr_mode =3D=3D PS_MODE_ACTIVE) */ if (ps_mode =3D=3D PS_MODE_ACTIVE) { if (pwdinfo->opp_ps =3D=3D 0) { pwrpriv->pwr_mode =3D ps_mode; - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); + rtw_set_firmware_ps_mode(padapter, ps_mode); pwrpriv->bFwCurrentInPSMode =3D false; } } else { @@ -206,14 +218,13 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_= mode, u8 smart_ps, u8 bcn_a pwrpriv->pwr_mode =3D ps_mode; pwrpriv->smart_ps =3D smart_ps; pwrpriv->bcn_ant_mode =3D bcn_ant_mode; - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); + rtw_set_firmware_ps_mode(padapter, ps_mode); =20 /* Set CTWindow after LPS */ if (pwdinfo->opp_ps =3D=3D 1) p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 0); } } - } =20 static bool lps_rf_on(struct adapter *adapter) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 62ada1790d0d..b62ebd011886 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1105,17 +1105,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_H2C_FW_PWRMODE: - { - u8 psmode =3D (*(u8 *)val); - - /* Forece leave RF low power mode for 1T1R to prevent conficting setti= ng in Fw power */ - /* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yscha= ng. */ - if (psmode !=3D PS_MODE_ACTIVE) - ODM_RF_Saving(podmpriv, true); - rtl8188e_set_FwPwrMode_cmd(Adapter, psmode); - } - break; case HW_VAR_H2C_MEDIA_STATUS_RPT: rtl8188e_set_FwMediaStatus_cmd(Adapter, (*(__le16 *)val)); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index bbbdcfa253f8..26dd395c239f 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -20,7 +20,6 @@ enum hw_variables { HW_VAR_DM_FUNC_CLR, HW_VAR_AC_PARAM_BE, HW_VAR_AMPDU_FACTOR, - HW_VAR_H2C_FW_PWRMODE, HW_VAR_H2C_MEDIA_STATUS_RPT, }; =20 diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/stagin= g/r8188eu/include/rtw_pwrctrl.h index 1d7dba853c40..affaf4ca5495 100644 --- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h +++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h @@ -95,6 +95,7 @@ struct pwrctrl_priv { =20 void rtw_init_pwrctrl_priv(struct adapter *adapter); =20 +void rtw_set_firmware_ps_mode(struct adapter *adapter, u8 mode); void rtw_set_ps_mode(struct adapter *adapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); void LeaveAllPowerSaveMode(struct adapter *adapter); --=20 2.35.1