From nobody Tue Jun 30 01:42:16 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 25DE8C433EF for ; Sun, 30 Jan 2022 19:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355749AbiA3TDn (ORCPT ); Sun, 30 Jan 2022 14:03:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232467AbiA3TDi (ORCPT ); Sun, 30 Jan 2022 14:03:38 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D0AAC06173B for ; Sun, 30 Jan 2022 11:03:36 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id u18so22357952edt.6 for ; Sun, 30 Jan 2022 11:03:36 -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=tpjEU+HIzlgzBoge8WodNw05G6vDhZ9EYEyUvkNOGoo=; b=naQ3ofGHLF180Kudff9gq5aGmb5N7VtlRFVbdjziOzgFQpXE6F4uWIZr7W+ur3F6vI e3b0tNN6cy+yyscOG17KL7HSVODDRGynY2VEm7CqYaTUJ1wYJS1/6ZIsjzvFD3MlpwY5 gcFE3rXQdgMsU+HDn8KG27NMvZ2cTVsBW0LXZ08McMbEc0f8cghELdg5x2VNiMb2h3eS CeMa0jhVfFybb65+tM44YeJZjEpLxIQyG3pfpKM9EOIUYAkVJUcOlqGi/Vr1X4y5Ymv9 vxWvf0AdkS2PQwEYsR003Wd+BRetW6w5NqA/1+gRzMaol8hCAGxH9bnD2CqUxbaDL/dD FI2w== 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=tpjEU+HIzlgzBoge8WodNw05G6vDhZ9EYEyUvkNOGoo=; b=zLoG4RCeqXjRQEpHSCAly+3v45BaE3r2E4DQm8JBs7hsTxToqP7mM7yEMO33sFBO+o v7oJo82v+rHpLlDgSVJIN8MyGPP/+d+G7ZZCaz/y3zkFP2yGCCRQMF03/f+stTgovr/K uZPgxE1aa27bkh5rW71sz0ccpepfRsOj6o3FvI2Sqa7Yc/eWfe4LXqE34dQu9MO2saIQ pNNCAZdyY9QJHj/FU6myiY3YlOOSqbuGe+89KXcmrs/hDcs14T903ig12WFr/f4fT+yP AZlreB9O5BRDlAVZw/qAzcaPgr4T48f8eizliNisnkb8Vi+dGBxQ/ixljgNKAG5fjTrG 7I7g== X-Gm-Message-State: AOAM532ptGKTjP5X1TDS0Wg6oV2xD4Ip3jkqvZpGIIlAePT9iAe7SKWX szJoB5i35tBFsvY6qBs6ZQM= X-Google-Smtp-Source: ABdhPJwgn4s4l4xW0DYeD7BDUIO5LZxcNr4KsaPnrESap+vQCq1swDXv7rQGG/omvrlDka+XZMxXxw== X-Received: by 2002:a50:ab1a:: with SMTP id s26mr17283316edc.85.1643569414894; Sun, 30 Jan 2022 11:03:34 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:34 -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 01/12] staging: r8188eu: remove HW_VAR_BEACON_INTERVAL Date: Sun, 30 Jan 2022 20:03:10 +0100 Message-Id: <20220130190321.7172-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_BEACON_INTERVAL from SetHwReg8188EU() and call rtw_write16() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index aa5ed6ecc432..ca4135ae587d 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -7053,7 +7053,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) SetHwReg8188EU(padapter, HW_VAR_BASIC_RATE, cur_network->SupportedRates); =20 /* BCN interval */ - SetHwReg8188EU(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&pmlmeinfo->bcn_i= nterval)); + rtw_write16(padapter, REG_BCN_INTERVAL, pmlmeinfo->bcn_interval); =20 /* udpate capability */ update_capinfo(padapter, pmlmeinfo->capability); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 7043dd603c11..95e89c3063f1 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1246,9 +1246,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) rtw_write16(Adapter, REG_RL, RetryLimit << RETRY_LIMIT_SHORT_SHIFT | Re= tryLimit << RETRY_LIMIT_LONG_SHIFT); } break; - case HW_VAR_BEACON_INTERVAL: - rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val)); - 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 40e1f98f9587..f5a6cb9a03fd 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_MLME_DISCONNECT, HW_VAR_MLME_SITESURVEY, HW_VAR_MLME_JOIN, - HW_VAR_BEACON_INTERVAL, HW_VAR_SLOT_TIME, HW_VAR_RESP_SIFS, HW_VAR_ACK_PREAMBLE, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 57F84C433F5 for ; Sun, 30 Jan 2022 19:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232467AbiA3TDp (ORCPT ); Sun, 30 Jan 2022 14:03:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355523AbiA3TDi (ORCPT ); Sun, 30 Jan 2022 14:03:38 -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 72D51C061741 for ; Sun, 30 Jan 2022 11:03:37 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id jx6so36377861ejb.0 for ; Sun, 30 Jan 2022 11:03:37 -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=2J/aQ9AQ1tUzCIztuJ6yMYj0ykJYPL3EoCYMelHD2cg=; b=G/RYvTibsfIxb+lndRj/Cf0q2Ssir5hF4b2QBb2H9afM1ggumHWdJwCuTHi18nqDK3 jiDgjiOwDgekk/cbPQfK11Brzrl/KR2bPEuk5J/PHwKUxj/ElgAFoNs4le+0MUqvUkww Zvrlm0pEEVIcc76Gfdi6RU7M0bYjCNr8sVxJVoiAkgTrv+wky5Sr4eVfBDXSBp+oaRu/ rn3LwzKuY421Mm9cvLomIol3noGyAnBJSc7pWCPWZUX6HJxdScOJgrG9aAPPAmSOcqAy YCBEXB+3APsOd6lr+QT59faQ7EXkhY6R4GEphmkt5XjqaOO6a9jiukCc2oeV4z/e1QBT c9Hg== 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=2J/aQ9AQ1tUzCIztuJ6yMYj0ykJYPL3EoCYMelHD2cg=; b=sfqjoIAIpCeOqoPRtWeI8LyTiSzWjIgseaYb3R0GgTRWMVPHPMzUFTpwB01Ist79AY AtPhUJQbR2EwgFNO/dEXg2N5rk4dXvVauWUH54cp0bpOkZomMgqZBRIyqlEy8ZmMKyXE VnVPmigJaJhCkSLGYHnw+aAYoW4ercoBLnUh6wGFJ2W75u4dV+yDopm6Rd0lbU6PfuWh mgzsgkD+7MRoNXbPV/ue7zo+ImSeQWujBJEODdkhwnBHd2/jiYT/W7l8R5GHxPWVzFRg ie4YEopIYAxew+Z6rbrrBKFswNDNtUr0eDae0uO6yNYesgAh9Z7ZP1Jk5wGRHKyyANnt lTow== X-Gm-Message-State: AOAM533OE+sqAMQ9Ue5XYicHCoi9s0jZnI+0HJY3/Yh5nUacXwbeVCAJ lgzZGqQYCUJYJnbi8BNIaPk= X-Google-Smtp-Source: ABdhPJyoS14JOH+r7QylwrqKq0J9jt75zFltYWWsmsS6+ukiAYM4yezQDTmFtUNtm7xG4fKCMMwZLg== X-Received: by 2002:a17:906:7316:: with SMTP id di22mr14901977ejc.505.1643569415685; Sun, 30 Jan 2022 11:03:35 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:35 -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 02/12] staging: r8188eu: remove HW_VAR_SEC_CFG Date: Sun, 30 Jan 2022 20:03:11 +0100 Message-Id: <20220130190321.7172-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_SEC_CFG from SetHwReg8188EU() and call rtw_write8() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 9 +++------ drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index ca4135ae587d..e7782d2499a8 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6400,7 +6400,6 @@ u8 collect_bss_info(struct adapter *padapter, struct = recv_frame *precv_frame, st void start_create_ibss(struct adapter *padapter) { unsigned short caps; - u8 val8; u8 join_type; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; @@ -6415,8 +6414,7 @@ void start_create_ibss(struct adapter *padapter) caps =3D rtw_get_capability((struct wlan_bssid_ex *)pnetwork); update_capinfo(padapter, caps); if (caps & cap_IBSS) {/* adhoc master */ - val8 =3D 0xcf; - SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); + rtw_write8(padapter, REG_SECCFG, 0xcf); =20 /* switch channel */ /* SelectChannel(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_= DONT_CARE); */ @@ -6472,7 +6470,7 @@ void start_clnt_join(struct adapter *padapter) =20 val8 =3D (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_8021X) ? 0xcc : 0= xcf; =20 - SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); + rtw_write8(padapter, REG_SECCFG, val8); =20 /* switch channel */ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_off= set, pmlmeext->cur_bwmode); @@ -6488,8 +6486,7 @@ void start_clnt_join(struct adapter *padapter) } else if (caps & cap_IBSS) { /* adhoc client */ Set_MSR(padapter, WIFI_FW_ADHOC_STATE); =20 - val8 =3D 0xcf; - SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); + rtw_write8(padapter, REG_SECCFG, 0xcf); =20 /* switch channel */ set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_off= set, pmlmeext->cur_bwmode); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 95e89c3063f1..1fa57354389a 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1290,9 +1290,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) rtw_write8(Adapter, REG_RRSR + 2, regTmp); } break; - case HW_VAR_SEC_CFG: - rtw_write8(Adapter, REG_SECCFG, *((u8 *)val)); - break; case HW_VAR_DM_FLAG: podmpriv->SupportAbility =3D *((u8 *)val); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index f5a6cb9a03fd..5fb0143c86fe 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -23,7 +23,6 @@ enum hw_variables { HW_VAR_SLOT_TIME, HW_VAR_RESP_SIFS, HW_VAR_ACK_PREAMBLE, - HW_VAR_SEC_CFG, HW_VAR_BCN_VALID, HW_VAR_DM_FLAG, HW_VAR_DM_FUNC_OP, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 BC924C433F5 for ; Sun, 30 Jan 2022 19:03:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355833AbiA3TDu (ORCPT ); Sun, 30 Jan 2022 14:03:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355543AbiA3TDj (ORCPT ); Sun, 30 Jan 2022 14:03:39 -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 ED85FC061748 for ; Sun, 30 Jan 2022 11:03:37 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id m4so36106419ejb.9 for ; Sun, 30 Jan 2022 11:03:37 -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=qxj0iB/eMUcfNUAgzK18y+5Dk7DeQji/c56lMFl6ONU=; b=K3Onn5NEayj+wNxch/QvAzA/AeIJcpp1mlFkdh+ruahgGHmX23B/v9cu5cqH9RKcX8 RRQHgFViC48JwugRg9BENIUJpKgBCxxYBQlgXeUr7xZ7GqrzjXAkYSeu/1LNJfjkgepf rMgUrEwsQ94dMOosZIXc5rC92+iMtsmDGY6a6cuAcVYTi487sLccJKCihf+38V8rdyDu FAhuVL3HlK7Z3XQFfkhr0Q7SOcQEDzqir+nJjqFM2FQO/8zbq5UtnzeYF4bQRaaKuh6v SRByIQxfO3fX4QjZMnjZiwOgkYbK6nxd2R+1JLC8SWYpg6u0CXdG4ls1VvM8pfos+U9C DZAA== 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=qxj0iB/eMUcfNUAgzK18y+5Dk7DeQji/c56lMFl6ONU=; b=KgT9JSsnJs6//rau7570PB0oYR61Rcyfdd79aiuimCxOrFIUdSwuK2oyWHg5pP6E4R wX5cVaoSkpronQqGdOohmLlKfQory1/Ed2JFN/F09aaumLRpMm2fUKUF3n5aTfAwThjL h1l4Whm8a9K4LfQXpHdFTg0nUF/NUPTsQpZedsYdvcLUMNTZCoBUNDhhqXoN7t2YBoKa XIupNy8Z9NKXlDvix1kY9glqlXsDNKLHm1OZfHwpvM3BKv4Fob9BGSFdTKLjgLy0KMzV 0NUPSIYCqrOQkHDKR5ULfy3viod5m53YjzSLS8uFjT1+4Ip2xsl2WhN1IgoT5bNa9Xtv W6ZQ== X-Gm-Message-State: AOAM533ej7CtZdiyjc66a/O6MiRi2NY0qxk4nKvLYcR774cfnF+4Hyhx OKlxtknlzwcFTEffnOiTf8m+xNoTz9c= X-Google-Smtp-Source: ABdhPJyZW59ublDLOclsFrgWGOh4x3ST2X8l5hkUCNSELgdG58yJEeHDmgDKIyl5jFIH1H5noAUK5g== X-Received: by 2002:a17:907:7da2:: with SMTP id oz34mr7580751ejc.400.1643569416541; Sun, 30 Jan 2022 11:03:36 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:36 -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 03/12] staging: r8188eu: remove HW_VAR_CAM_INVALID_ALL Date: Sun, 30 Jan 2022 20:03:12 +0100 Message-Id: <20220130190321.7172-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_CAM_INVALID_ALL from SetHwReg8188EU() and call rtw_write32() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 4 ++-- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index d40669c21fc1..34d271b737e9 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -429,7 +429,7 @@ unsigned int decide_wait_for_beacon_timeout(unsigned in= t bcn_interval) =20 void invalidate_cam_all(struct adapter *padapter) { - SetHwReg8188EU(padapter, HW_VAR_CAM_INVALID_ALL, NULL); + rtw_write32(padapter, RWCAM, BIT(31) | BIT(30)); } =20 void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *= key) @@ -492,7 +492,7 @@ void flush_all_cam_entry(struct adapter *padapter) struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 - SetHwReg8188EU(padapter, HW_VAR_CAM_INVALID_ALL, NULL); + rtw_write32(padapter, RWCAM, BIT(31) | BIT(30)); =20 memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info)); } diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 1fa57354389a..bdadd9588c79 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1332,9 +1332,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) } } break; - case HW_VAR_CAM_INVALID_ALL: - rtw_write32(Adapter, RWCAM, BIT(31) | BIT(30)); - break; case HW_VAR_CAM_WRITE: { u32 cmd; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 5fb0143c86fe..0a687fa4326d 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -29,7 +29,6 @@ enum hw_variables { HW_VAR_DM_FUNC_SET, HW_VAR_DM_FUNC_CLR, HW_VAR_CAM_EMPTY_ENTRY, - HW_VAR_CAM_INVALID_ALL, HW_VAR_CAM_WRITE, HW_VAR_CAM_READ, HW_VAR_AC_PARAM_VO, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 E61DDC433F5 for ; Sun, 30 Jan 2022 19:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355803AbiA3TDx (ORCPT ); Sun, 30 Jan 2022 14:03:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355562AbiA3TDj (ORCPT ); Sun, 30 Jan 2022 14:03:39 -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 B0C06C061749 for ; Sun, 30 Jan 2022 11:03:38 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id me13so36110979ejb.12 for ; Sun, 30 Jan 2022 11:03:38 -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=eEfV06ahonsBQJ0GSyBXy9Nohpt6e+HGvZCgdOKH2uk=; b=jzBwIEQAeLJSSiE/JfnVKiEzdMRNfH8uoxLD9L5kWkB9XcYRFRcezhAw5if2jz0Guq 0a7RApKVksG5mFhf4sb92QceI5A/W3+0kBryEbWScLYtqMcKB+Ms2D3y+cWxr/Hp+EGR PzxKoafUcM1ABF2lh8byOLatDz0d5heQkdXXCdGym1aBqA3RvMthAEiZdwQ3bVJM70Tw 43ms2JKjpD2KH4u9SxYj3YUBwpo2dUBXaeN7OO3SJ+8YUPW+1qEvPiM9K0xM43IQZMsw UwTPt2GdEzlPFla9hiKBmcJI3/jnSsurHW1Mh6wmX0sJ+Y7fURbtLLjXufZ7+uEK30ye zk6A== 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=eEfV06ahonsBQJ0GSyBXy9Nohpt6e+HGvZCgdOKH2uk=; b=PBVcT5+JSAZW1ef94ZLOtC14ngj5td7FswYEyMlVLQvnX2kNJKRvzzXAUKtC+kgu4/ KUGo6ros+5Ci6fjTE+4nyTW7B5KjoIdCKnIzuaU5bnxxE6haGxyOVmc6jf+c3s08Y0kv kPSbqRJgyEObwEnpESQrg5vW5ueTzcf2x/zRCxYCeYz/0e0ZyE7twG2bfVZho66x4uEs Bf3D5BwN3d0F5FAw2ueVqWQVa9vKRGBnVi69hVY4tV8qEV5HOd0NNpNNvcFB5/yRACLP HfQDD6o778WDQwvnetn/aj80hIOlVt5mnaQtsh2qV7YVf8DmNGycl4OJbPnllEsCb789 3kyg== X-Gm-Message-State: AOAM531IX2TiRxo4UUKXwvDqnI30IIONb3UtzENCqO2hcrtZ/qJIeJmK Vnj18CrEq0f7gEtdrr/hZvw= X-Google-Smtp-Source: ABdhPJxY/NebjkBrz+nz7MRwBs+KzOd6JMiFu+84EVl0qwuxLIv7ODjZWT2m1audC0bFdq0eEEM3Vg== X-Received: by 2002:a17:907:8a0b:: with SMTP id sc11mr14055828ejc.310.1643569417311; Sun, 30 Jan 2022 11:03:37 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:37 -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 04/12] staging: r8188eu: remove HW_VAR_AC_PARAM_VO Date: Sun, 30 Jan 2022 20:03:13 +0100 Message-Id: <20220130190321.7172-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_AC_PARAM_VO from SetHwReg8188EU() and call rtw_write32() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 34d271b737e9..a09a4a5d7dc7 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -567,7 +567,7 @@ void WMMOnAssocRsp(struct adapter *padapter) edca[XMIT_VI_QUEUE] =3D acParm; break; case 0x3: - SetHwReg8188EU(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acParm)); + rtw_write32(padapter, REG_EDCA_VO_PARAM, acParm); acm_mask |=3D (ACM ? BIT(3) : 0); edca[XMIT_VO_QUEUE] =3D acParm; break; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index bdadd9588c79..4af44f0d10c0 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1342,9 +1342,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) rtw_write32(Adapter, RWCAM, cmd); } break; - case HW_VAR_AC_PARAM_VO: - rtw_write32(Adapter, REG_EDCA_VO_PARAM, ((u32 *)(val))[0]); - break; case HW_VAR_AC_PARAM_VI: rtw_write32(Adapter, REG_EDCA_VI_PARAM, ((u32 *)(val))[0]); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 0a687fa4326d..c2df72e91701 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -31,7 +31,6 @@ enum hw_variables { HW_VAR_CAM_EMPTY_ENTRY, HW_VAR_CAM_WRITE, HW_VAR_CAM_READ, - HW_VAR_AC_PARAM_VO, HW_VAR_AC_PARAM_VI, HW_VAR_AC_PARAM_BE, HW_VAR_AC_PARAM_BK, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 8B8ADC433EF for ; Sun, 30 Jan 2022 19:03:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355846AbiA3TD5 (ORCPT ); Sun, 30 Jan 2022 14:03:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355573AbiA3TDj (ORCPT ); Sun, 30 Jan 2022 14:03:39 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80163C061714 for ; Sun, 30 Jan 2022 11:03:39 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id r10so22694846edt.1 for ; Sun, 30 Jan 2022 11:03:39 -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=eWKC8EYtadWC+XGVduMfPXQkoMLfg/diQ6x5K2CsNlg=; b=g4pdwXr4gipw3Aw0TAzR5Ia26hePTyoFqBjjR5A+tyMOS1fUXpP36QgLhK9nugIb9/ KspkISq4y202PbWPtFHWiSydoNlTGdQpkRY1n2XbXRg1ma066UfI2+Wo+LBDYfiMbiA4 IE/V95hqiTrjMKMNYmx0pYeNNcitq6pGe0sPwUKmAYyPvXMLtKxMyKBSlgdhzi9MuFHi DQzYOoNiTVEAA1eoUbaHdLZQEpd34zdm2JEhLTCyAdldkc6rKs8KAuz0RO4GEh2aU5jN g1t8rLGr1XxnUOnDloi8/IFJvyuk1WMnehZCoNEUuVYoww9IV443Hk4cdeOPWQoCbzyP 1RCQ== 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=eWKC8EYtadWC+XGVduMfPXQkoMLfg/diQ6x5K2CsNlg=; b=38gsjmY8Swd4NNUOdbBnG+PEKaHjm6aGWXbu1tJaBeAkdGU1P0b3TiPYEOUio/X+7Z ygq71Pag8Ei7RreSAX8DUlYXv73N+SC6XoYoJbB0cbnvt1IsBwfZi7+gu4jYGxkP6+Vj vUeHAxPpaWit83FEWP9uydpKa0KEo7t+hRIvksTGH8L5qXOOeWfqNPPT1miecysPU929 IjPEzdfhT7AlNGvdBhDs5hUyiS5KemTXJX6IOU7yAV+Uax4jX6pCe6jKcGZuMOJ0MpCd Xh1v9lrM58WkEWVlTcA1CW+xBl1wieDGK3VD4bv/618fq/VzJ2U+V17LwNGeH8j6rwfK sPQQ== X-Gm-Message-State: AOAM533p3HJ+SfO86RvLfKHSG6KBk05WKR8hDgi/K9NAhpKt1d2jNv+T IkfmJ78MzOw4BocdYU8/3wv/JhkpSqo= X-Google-Smtp-Source: ABdhPJxjqA9ClXlm0KoCtzlrvLlHrIyubx4WMVqLWfmViGIyO0vpqBgpOGAWcwFeEe9jLEl3SKTbmA== X-Received: by 2002:a05:6402:190f:: with SMTP id e15mr17384039edz.195.1643569418088; Sun, 30 Jan 2022 11:03:38 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:37 -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 05/12] staging: r8188eu: remove HW_VAR_AC_PARAM_VI Date: Sun, 30 Jan 2022 20:03:14 +0100 Message-Id: <20220130190321.7172-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_AC_PARAM_VI from SetHwReg8188EU() and call rtw_write32() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index a09a4a5d7dc7..ac1ab5c6b169 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -562,7 +562,7 @@ void WMMOnAssocRsp(struct adapter *padapter) edca[XMIT_BK_QUEUE] =3D acParm; break; case 0x2: - SetHwReg8188EU(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acParm)); + rtw_write32(padapter, REG_EDCA_VI_PARAM, acParm); acm_mask |=3D (ACM ? BIT(2) : 0); edca[XMIT_VI_QUEUE] =3D acParm; break; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 4af44f0d10c0..82dc0324fbab 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1342,9 +1342,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) rtw_write32(Adapter, RWCAM, cmd); } break; - case HW_VAR_AC_PARAM_VI: - rtw_write32(Adapter, REG_EDCA_VI_PARAM, ((u32 *)(val))[0]); - break; case HW_VAR_AC_PARAM_BE: haldata->AcParam_BE =3D ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index c2df72e91701..03566f317513 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -31,7 +31,6 @@ enum hw_variables { HW_VAR_CAM_EMPTY_ENTRY, HW_VAR_CAM_WRITE, HW_VAR_CAM_READ, - HW_VAR_AC_PARAM_VI, HW_VAR_AC_PARAM_BE, HW_VAR_AC_PARAM_BK, HW_VAR_ACM_CTRL, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 70C50C433F5 for ; Sun, 30 Jan 2022 19:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355813AbiA3TEA (ORCPT ); Sun, 30 Jan 2022 14:04:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355631AbiA3TDk (ORCPT ); Sun, 30 Jan 2022 14:03:40 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FC6BC061714 for ; Sun, 30 Jan 2022 11:03:40 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id p15so36012657ejc.7 for ; Sun, 30 Jan 2022 11:03:40 -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=6O9P4Kn3wzm5lIy7NIDIKwmOMq5SzJG+TZSo9CxgId8=; b=Ddhz1OwGjmXtYEI7suKaTmxXESQgm5tcS1Ejzb/nuKsQLkDzk3GXMstz+jinBK/R2l MmgEGFR7llBRoYe6yILkxTSbwxhgn7W1tplCKEAe02SjH/holnPS7h17MouXbQSi+XHP CWu7710SoiOrmJh9YRDzOgzVKuJubZNNSAHVYCtPPXUpdpLD/54oU0iaIz7QGYrmpBrz NfL6BA5lihH1Ry0EVsh/vMoBYGxzVTULlxaiyykzhvKDbbIqOn3H0pp5tg2HqWu1QJrI U9LaCaobBbo3VXuEELpF8Uk/NDfmg21akFM95slHOYixiilIee8dGoMDw7qRYkgGj/b7 p84Q== 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=6O9P4Kn3wzm5lIy7NIDIKwmOMq5SzJG+TZSo9CxgId8=; b=I8WNifJO3bF2EFPudeOznCv582iwx4xQL/v3b7rJVIQtol52y+GfsT0Z57VuGxz1ks 9sPPJXe6Vbe92Ec0ROeELzocW01YzDoTam4Zba3ksHXzWh//LDr9wmDHmvqfSqsMvav0 VXz9McKudlqtNqda0GNgVZnrlUannAIJZF+gfiIj7UdAHEEAshrJ4sLjWaSMgMoRfdvp 2Q2sMAhakUH6rZ92h0+VM9R52Fa3KYpmCOPoWxQBE3X2eBuh6y54wrRM5HHcGVyaxmVn N+F6XmAdapRDBI1S4Zq2BbmcTxBh1+rWkTpMnayY2IrunMDRkocxx/gJmOzKW1EKw9eo n1dg== X-Gm-Message-State: AOAM532qG0b0zZ8hOdDskZD138RlEb30aCN5wEohNrEWXkb0bsKozAhn 5+9w8Ix541V1LAwKQCWXMaM= X-Google-Smtp-Source: ABdhPJw/y5MTRn6TA4GvLFeY4yLkecZYWSgilPqzGI9fa++8QTlZWpkwniwsyidm4WRwxGB+wuQSTA== X-Received: by 2002:a17:907:213c:: with SMTP id qo28mr14987414ejb.325.1643569418851; Sun, 30 Jan 2022 11:03:38 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:38 -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 06/12] staging: r8188eu: remove HW_VAR_AC_PARAM_BK Date: Sun, 30 Jan 2022 20:03:15 +0100 Message-Id: <20220130190321.7172-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_AC_PARAM_BK from SetHwReg8188EU() and call rtw_write32() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index ac1ab5c6b169..62a96e59b00d 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -558,7 +558,7 @@ void WMMOnAssocRsp(struct adapter *padapter) edca[XMIT_BE_QUEUE] =3D acParm; break; case 0x1: - SetHwReg8188EU(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acParm)); + rtw_write32(padapter, REG_EDCA_BK_PARAM, acParm); edca[XMIT_BK_QUEUE] =3D acParm; break; case 0x2: diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 82dc0324fbab..3d05bae459b7 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1346,9 +1346,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) haldata->AcParam_BE =3D ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); break; - case HW_VAR_AC_PARAM_BK: - rtw_write32(Adapter, REG_EDCA_BK_PARAM, ((u32 *)(val))[0]); - break; case HW_VAR_ACM_CTRL: { u8 acm_ctrl =3D *((u8 *)val); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 03566f317513..169f1cccafdb 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -32,7 +32,6 @@ enum hw_variables { HW_VAR_CAM_WRITE, HW_VAR_CAM_READ, HW_VAR_AC_PARAM_BE, - HW_VAR_AC_PARAM_BK, HW_VAR_ACM_CTRL, HW_VAR_AMPDU_MIN_SPACE, HW_VAR_AMPDU_FACTOR, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 E5ECDC433F5 for ; Sun, 30 Jan 2022 19:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355848AbiA3TEE (ORCPT ); Sun, 30 Jan 2022 14:04:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355675AbiA3TDl (ORCPT ); Sun, 30 Jan 2022 14:03:41 -0500 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 E4D8FC061714 for ; Sun, 30 Jan 2022 11:03:40 -0800 (PST) Received: by mail-ed1-x530.google.com with SMTP id w25so21685368edt.7 for ; Sun, 30 Jan 2022 11:03:40 -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=jhz6BST1YYjMMuHmLP73e+gH+hSHU2pinLOrqLycFXQ=; b=Ox76lBFdBm6M7RVdiI6u3f8fcLujt3iSnk/iBR65DY6/6AVtkMU4lr7EAAc7KOYcW9 SOvvIMDMx0/57eWA1T75WMs7mmRF4z3md5NgnEQxt68yljaZ7XVqtJAgCdfu6Xb2Fynt n0nTr9sAGvpx5ERcAtEiRfGgOMa1/TMDw6zZSadfS4P5CxjKV4bKNQVZL43QV8kJHcqD 4XbaQ8o73yadah6lih4JUihIDu77w7Y3HDpD0O9rBMpTIP7VnAOByHqT2uR2wujgYOhA GHvbTep4GLLh8DoNZfpDvGJYxxYyUJtW0pC55mfAQC9HjdScllNeaMfuT+nT6WGOnOsP cgJA== 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=jhz6BST1YYjMMuHmLP73e+gH+hSHU2pinLOrqLycFXQ=; b=S4GQidItyVezx00TyRjEUmAYmGHxpXZEv6pRo/WiN7fIvguk8lWeqdDMK6d51/aArY 2XZ8eK9YdAd9CHHVRgQZ8MuJBJM5cMvts2vLi7z5juimFQBqKNyjbSK+4IjreTAwVxXM Kf6n1KjBNGqU6T1H2wOnzRfCiTMa4HEJ3kOlKT5x4GIGNLZe63VD8hm7ZkYIDHpOGs1P iFz6kAgi6f0POVD8xfr+f6qhpZ+UCbC6tRKtTa5VXjFCwOLTW/vdoKyUM4OZ/3N+H+eD fA53+B84PeOhXRq1JJWAwiUSrEgUngdVD7Uy1XlSy/N3uclv5wUVtZKWEJMT7egED6vm s6XQ== X-Gm-Message-State: AOAM532algPgeEBL5kudiaga6KiZzRpJmEAHLTFzp94vuqlunhlFvuCB 7+ry4Hg4V1+HFK52TpbNaVg= X-Google-Smtp-Source: ABdhPJz8vOfx1TDw8IeMyjtvxHmdPrldqreTPTyFUgKeavy8P0v5YZjxqhewcj9RZMcmY+tdZfOR8Q== X-Received: by 2002:a50:d907:: with SMTP id t7mr17855349edj.59.1643569419590; Sun, 30 Jan 2022 11:03:39 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:39 -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 07/12] staging: r8188eu: remove HW_VAR_MEDIA_STATUS Date: Sun, 30 Jan 2022 20:03:16 +0100 Message-Id: <20220130190321.7172-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_MEDIA_STATUS from SetHwReg8188EU() and call rtw_read8() and rtw_write8() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 6 +++++- drivers/staging/r8188eu/hal/usb_halinit.c | 9 --------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 62a96e59b00d..d28929a95108 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -286,7 +286,11 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode= , u8 enable) =20 static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type) { - SetHwReg8188EU(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type)); + u8 val8; + + val8 =3D rtw_read8(padapter, MSR) & 0x0c; + val8 |=3D type; + rtw_write8(padapter, MSR, val8); } =20 void Set_MSR(struct adapter *padapter, u8 type) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 3d05bae459b7..96088a344d47 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1068,15 +1068,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) struct odm_dm_struct *podmpriv =3D &haldata->odmpriv; =20 switch (variable) { - case HW_VAR_MEDIA_STATUS: - { - u8 val8; - - val8 =3D rtw_read8(Adapter, MSR) & 0x0c; - val8 |=3D *((u8 *)val); - rtw_write8(Adapter, MSR, val8); - } - break; case HW_VAR_SET_OPMODE: hw_var_set_opmode(Adapter, val); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 169f1cccafdb..2912151c7830 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_MEDIA_STATUS, HW_VAR_SET_OPMODE, HW_VAR_BSSID, HW_VAR_INIT_RTS_RATE, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 A9A8AC433EF for ; Sun, 30 Jan 2022 19:04:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355850AbiA3TEJ (ORCPT ); Sun, 30 Jan 2022 14:04:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355715AbiA3TDm (ORCPT ); Sun, 30 Jan 2022 14:03:42 -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 C0AC8C061714 for ; Sun, 30 Jan 2022 11:03:41 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id d10so36046708eje.10 for ; Sun, 30 Jan 2022 11:03:41 -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=SjrS4w62Uxe/qB4XuyiE0X5ZGBxg6belQDWbZp4WXro=; b=VcHipuRlcMhw51ycNd0cS+uaV562SgbCeZh1l4+E/UGQ8bh3r9hMFdqJekO/Ov+rdr P9ulOSxmhyICgmnAkLAG1i6fXRDd6QLnUuGwKpPlQd1+s5pVMoGwZDi7DyV03oUxjHJq i31AZmt7mW6KOpxouuSlCDE2RDY27kyqM/kK557oUXyoLOfHTLJUSvI2in8pttK/XBKw ArlBkdRv3D89ZR0pgECjjSo1+22KTYF7emg1Lskp6aOE9cHIWf9zn5KwEc+8Gf1MrgA7 9AxpIvMR/eigvaKCo9foAC4gktLV0VhoTh7QixAx0AuTW3A4vYr4tMARrySZOY8cQVr3 jbzw== 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=SjrS4w62Uxe/qB4XuyiE0X5ZGBxg6belQDWbZp4WXro=; b=xgcWvmepuJChzSjXpPTkMhSp9DlYP8J0CPedCyPlcy5YZgBwfxzY3dPjwv+Lzq6qIu W1qZBwnuWHVxiAqPCs5poaNgfdMjGiL67V3L4as4XPiiW1bwD7LyocMdPetnqrvFTlNS aWMGy4ER5rQwu569nR4WgQgpiSP72qwmJJEl5WJkbbf3xUYv1Nv+T4BXnswtYU7A4sJj BwZ/qkIuvCEkE2VuVxZtuhKrNbtbnExGV7+BKG67whCMlzYGtSYll33oE077xaniKb+b 4uvIBbUDAA6x0L/yIqLnvEFr3dmSIkT8Og8BN8+wzdW78FlEKloN2dfBOAgpxgh+9/j+ IUEw== X-Gm-Message-State: AOAM532di5XRPfnnaiTWC5U2Tr5gsfbJBonNnboR+cncWTKC1MhspZiz EvdnLJ6HS07CPZiL7uBMRlQ= X-Google-Smtp-Source: ABdhPJzExYBx1f9ZUGVkoQI/n11wz7ig67rmXJmFtWZKZnguPW3vGcxjvZG1LyT1dI5V+pnYOKpaBQ== X-Received: by 2002:a17:907:9812:: with SMTP id ji18mr10471754ejc.200.1643569420373; Sun, 30 Jan 2022 11:03:40 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:40 -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 08/12] staging: r8188eu: merge Set_NETYPE0_MSR() and Set_MSR() Date: Sun, 30 Jan 2022 20:03:17 +0100 Message-Id: <20220130190321.7172-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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" Set_MSR() just calls Set_NETYPE0_MSR(). Merge the two functions. Keep Set_MSR() and remove Set_NETYPE0_MSR(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index d28929a95108..a8acec776b79 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -284,7 +284,7 @@ void Switch_DM_Func(struct adapter *padapter, u32 mode,= u8 enable) SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); } =20 -static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type) +void Set_MSR(struct adapter *padapter, u8 type) { u8 val8; =20 @@ -293,11 +293,6 @@ static void Set_NETYPE0_MSR(struct adapter *padapter, = u8 type) rtw_write8(padapter, MSR, val8); } =20 -void Set_MSR(struct adapter *padapter, u8 type) -{ - Set_NETYPE0_MSR(padapter, type); -} - inline u8 rtw_get_oper_ch(struct adapter *adapter) { return adapter->mlmeextpriv.oper_channel; --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 DF4C5C433F5 for ; Sun, 30 Jan 2022 19:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355874AbiA3TEV (ORCPT ); Sun, 30 Jan 2022 14:04:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355714AbiA3TDn (ORCPT ); Sun, 30 Jan 2022 14:03:43 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F20FC061741 for ; Sun, 30 Jan 2022 11:03:42 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id s13so36157757ejy.3 for ; Sun, 30 Jan 2022 11:03:42 -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=EBu/VgNr1P+8NOJbgZCzoP/cKUO7qZPe/m2OUsi2OqM=; b=SjcWhj7kEPfEDOFP2yv4cpBrfFZOAW8h+eozWkFGu+NqghG4Hq9FlI9Q+3wsl3XxPU bbEOiIii7LtFtPvy+mRTH6/6ykVuMPwIWQXpbWyKoS0fi1jNpMpOQPzleqoDLo7lveO5 i6Q/AxTEtB6OfMCWceDqgdgN5GDkfComStlgmmN7yM9aVuf/nxEKWkG6NMoNG8ATeGu3 uIh+45w22lSbRQBIRgNwonUyhF7F2T9vbbr1RxMVPONe+hpoHIgH03hOzgAV1NSWsxKt tx9cZCnKc5r47huUoAQDYDCh4uyt/mT22hY4Rz9K613r+NprxQL2POO9C5lSXyWHCccD ZpUw== 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=EBu/VgNr1P+8NOJbgZCzoP/cKUO7qZPe/m2OUsi2OqM=; b=JOFkR92S34hFqUFkFwqOAiaeGqr5i+9i8zZkD6NsP9/q5VeCmh/CII0ddTOsTPzo5l eTIQaxWq3T/Fo/AaE2X7ble+Y4p9mLfghiYOCMT/ac6wkDt1XDGJkYyxj7c6vkJ0ODwl GS8FM29fYt6F4ccSKI5cqLjgHUddYFn6ZSCLP1NPXCM/AoHXsqlxMmXIjGlk9pqz38/X RBvbRRjLWTXVjCm8jYDlaSFo6yI8i41MdHJajcAXh7OaMdvLMC7LKN44ouP//LDgvtaP g7O7xS+cuoOoZWa8/5ykWSmy2kPeqILkHFj9VQq3NmedCvUn6pq+p/LRn9vwOEhpWH5g xsrQ== X-Gm-Message-State: AOAM531ec0B+4ibo9KErkz0/Bossvv25Bip5/meDOUUj3/w9LSWOebbe vx72tLrM8EIc5y0xO2ydYx6ySWtDq+U= X-Google-Smtp-Source: ABdhPJzsi8U+lx5v5Yb/2+LFvC8xkhoYt+LtPlY30wrn4URXRCUfR/bWwC+jB36SG/41he2tOVpLZg== X-Received: by 2002:a17:907:7248:: with SMTP id ds8mr14627823ejc.713.1643569421213; Sun, 30 Jan 2022 11:03:41 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:40 -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 09/12] staging: r8188eu: remove HW_VAR_CAM_WRITE Date: Sun, 30 Jan 2022 20:03:18 +0100 Message-Id: <20220130190321.7172-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_CAM_WRITE from SetHwReg8188EU() and call rtw_write32() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 3 ++- drivers/staging/r8188eu/hal/usb_halinit.c | 10 ---------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index a8acec776b79..c6288c2d5f33 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -456,7 +456,8 @@ void write_cam(struct adapter *padapter, u8 entry, u16 = ctrl, u8 *mac, u8 *key) cam_val[0] =3D val; cam_val[1] =3D addr + (unsigned int)j; =20 - SetHwReg8188EU(padapter, HW_VAR_CAM_WRITE, (u8 *)cam_val); + rtw_write32(padapter, WCAMI, cam_val[0]); + rtw_write32(padapter, RWCAM, CAM_POLLINIG | CAM_WRITE | cam_val[1]); } } =20 diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 96088a344d47..d3daefc0e80f 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1323,16 +1323,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_CAM_WRITE: - { - u32 cmd; - u32 *cam_val =3D (u32 *)val; - rtw_write32(Adapter, WCAMI, cam_val[0]); - - cmd =3D CAM_POLLINIG | CAM_WRITE | cam_val[1]; - rtw_write32(Adapter, RWCAM, cmd); - } - break; case HW_VAR_AC_PARAM_BE: haldata->AcParam_BE =3D ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 2912151c7830..edb4696218fb 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -28,7 +28,6 @@ enum hw_variables { HW_VAR_DM_FUNC_SET, HW_VAR_DM_FUNC_CLR, HW_VAR_CAM_EMPTY_ENTRY, - HW_VAR_CAM_WRITE, HW_VAR_CAM_READ, HW_VAR_AC_PARAM_BE, HW_VAR_ACM_CTRL, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 B3E4DC433F5 for ; Sun, 30 Jan 2022 19:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355934AbiA3TEf (ORCPT ); Sun, 30 Jan 2022 14:04:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355761AbiA3TDo (ORCPT ); Sun, 30 Jan 2022 14:03:44 -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 92927C061714 for ; Sun, 30 Jan 2022 11:03:43 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id p12so22544042edq.9 for ; Sun, 30 Jan 2022 11:03:43 -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=ABytRs7kXzyQl1oWMNLrz9vNj9dbkxYUimcbfNxfvmk=; b=Qgo9WSeE3qKYQrUncnSeNX2H1TJ3YfR6c7x1nnagBmHQu7gdOjZXlzrB/to4888HDE M9F7eB8fQrdZkPRt8W7hDEnskhjMRGIKL7sNQJmfeQ6lNy9q/nOZuolwxPekrhaON2XK gLVljf99/3qApZzYcJQJGxK/mtBBkB1P1dz92U7pLtEd9J/vkCbc5rd+ABUb96CRZgXf opSYW9bSAFeCmYMh7OfH1JdisS8S5yq5eUF/y36xvdyXbVITvco8vlj8fAltdB7t6AQk r+PiN3Kg4HC370F/wwUChGpHA43mvx1v0HRZgJBu50FHknlG1IeYjA7f+q1D5QzPkct2 yW5A== 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=ABytRs7kXzyQl1oWMNLrz9vNj9dbkxYUimcbfNxfvmk=; b=k1vSLqn4mgpuU5N1Zy5ycBHoaR+10CTE2iOKjGL2bLk770DLrjnZnjdkYqh28vTKAb DnwhbBjbq1uBGr7kQm7RsrxQz9mUyHwVwrLWJOTjFAnVQIPmL/rW0Z1Nux92yvEaBTjB NUFQw59Yy03uHKQcrmVJgR3L55nLFHyE7x2niaKnLvuJhq/pP2hBIBtRYWOKWP80n4GC TUb71BmftjdOAA+SRTnHzw5GL194cmeluToQsvZVI6+CRpDgEbTiPORv5nQH9zEzftdC 6RHGF+SiDeg0mtDqbxvE63f/oiy48wegBBc+GXwLrdTqxuqayxHFcnrk9O3/lWtatmd4 BBJw== X-Gm-Message-State: AOAM530HlAx93y9zi9JTz5cjP5MfAjoEyypoipWVy8G2Aju8xgxgGoZF YCxt0OKLWytQtwOUeulSj2Y= X-Google-Smtp-Source: ABdhPJxKbKzQb7GzE2HbetOZFX76cytOXI2wE6Uh7FSbo2tI+jwKW7mgj6G7AuN+Ln9y971CcHqCPQ== X-Received: by 2002:a05:6402:11cd:: with SMTP id j13mr8781032edw.116.1643569422192; Sun, 30 Jan 2022 11:03:42 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:41 -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 10/12] staging: r8188eu: remove HW_VAR_BCN_FUNC Date: Sun, 30 Jan 2022 20:03:19 +0100 Message-Id: <20220130190321.7172-11-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_BCN_FUNC case in SetHwReg8188EU() just calls hw_var_set_bcn_func(). Remove HW_VAR_BCN_FUNC from SetHwReg8188EU(), remove hw_var_set_bcn_func() and call rtw_write8() directly. Since hw_var_set_bcn_func() was always called with value 0, we only need to keep the else arm of the if statement that checks the value. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/r8188eu/hal/usb_halinit.c | 15 --------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index e7782d2499a8..73069dddf6b7 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -7644,8 +7644,8 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned = char *pbuf) =20 if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_ADHOC_STATE) || ((pmlmeinfo= ->state & 0x03) =3D=3D WIFI_FW_AP_STATE)) { /* Stop BCN */ - val8 =3D 0; - SetHwReg8188EU(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8)); + val8 =3D rtw_read8(padapter, REG_BCN_CTRL); + rtw_write8(padapter, REG_BCN_CTRL, val8 & (~(EN_BCN_FUNCTION | EN_TXBCN_= RPT))); } =20 /* set MSR to no link state -> infra. mode */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index d3daefc0e80f..796c898bfb8c 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1049,18 +1049,6 @@ static void hw_var_set_bssid(struct adapter *Adapter= , u8 *val) rtw_write8(Adapter, (reg_bssid + idx), val[idx]); } =20 -static void hw_var_set_bcn_func(struct adapter *Adapter, u8 *val) -{ - u32 bcn_ctrl_reg; - - bcn_ctrl_reg =3D REG_BCN_CTRL; - - if (*((u8 *)val)) - rtw_write8(Adapter, bcn_ctrl_reg, (EN_BCN_FUNCTION | EN_TXBCN_RPT)); - else - rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg) & (~(= EN_BCN_FUNCTION | EN_TXBCN_RPT))); -} - void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) { struct hal_data_8188e *haldata =3D &Adapter->haldata; @@ -1109,9 +1097,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) rtw_write8(Adapter, REG_INIRTS_RATE_SEL, RateIndex); } break; - case HW_VAR_BCN_FUNC: - hw_var_set_bcn_func(Adapter, val); - break; case HW_VAR_CORRECT_TSF: { u64 tsf; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index edb4696218fb..7be5eb2c4a9b 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_BSSID, HW_VAR_INIT_RTS_RATE, HW_VAR_BASIC_RATE, - HW_VAR_BCN_FUNC, HW_VAR_CORRECT_TSF, HW_VAR_CHECK_BSSID, HW_VAR_MLME_DISCONNECT, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 9337DC433F5 for ; Sun, 30 Jan 2022 19:04:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355861AbiA3TEi (ORCPT ); Sun, 30 Jan 2022 14:04:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355801AbiA3TDo (ORCPT ); Sun, 30 Jan 2022 14:03:44 -0500 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 9138AC061714 for ; Sun, 30 Jan 2022 11:03:44 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id s5so36072170ejx.2 for ; Sun, 30 Jan 2022 11:03:44 -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=0WNZPBbLkLD5BATZjpOdpNx2Pq3vxYoH7d33hip6I60=; b=YQXKzKee807KM9FTAvhayv2BpNZlHZa8mLsZsZHvifprAjUBsZKdMAg/gECaH6jb5E +8Xy9Mjuj1z1ZLl+0+pd5gE83wKGlYqMSSYooNqYHUED0is7yIC5i2b4Pvfbm5L2Gi/s T9sc3SPU99qfjlgrXPyITWtT9ZCYsO0RjnSJpMlpztiCVnPCaADtqZQMHV0wsR8GGupc buq7S+7rQyaTTYWStZFTX5z7icIDq2AYh/nVQoOj3KtNTCF9fdwMQgDh+W/rTNo+P7Tl QFlek6LSvWtU1LLJOjSJeEQNBf5WoUQI6WCsaKuW2RfRp90QRgpknfISCUxjavdGXbGl JExw== 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=0WNZPBbLkLD5BATZjpOdpNx2Pq3vxYoH7d33hip6I60=; b=FMi48zC3YLfngOg3kJr3iuiE9ybmVV7FxW5Gm2Hu9bffZc9AkRxu4mEfHRMoz6BtGO D2CVH1TNp7cyf7zgeoUGcx4cZminYVPsaZQz1RL50oC7h1ER6vHRW0e6nFpODcyTrxR9 aiBpGSEIsW4cKrW0MwGXBLqYolu4dKJxcNuEAjGzTaISaPATEiTXy9tkpKwgpLiczSy1 Shm1Vx4Z/N7W/HCIXWIyIqqAAtV7Cpfb53Fm7dSrGHxZysaiZmlUHgpFeufVw0VGtdOY IbrNnsM4hcwEzeQCnzqjNzRZwE/ebiPGubcDeJbnbJvzQxGo3NfjEi5kw9NgV46urz28 0ilg== X-Gm-Message-State: AOAM533CURbWfXsqTi7ta0hmRLF7BpThVth6ZwISdOrsbHJnOtq+6nTR dHhNB3AccFtVkTIgtVgdlZY= X-Google-Smtp-Source: ABdhPJxKQ3eirYKDmDkWO9d7T7Ayf2b5TuaNS8KPTNjVEKyDQgZUKPwF+yEm4osx7+v3JIQSNVooig== X-Received: by 2002:a17:907:16a6:: with SMTP id hc38mr15249048ejc.291.1643569423221; Sun, 30 Jan 2022 11:03:43 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:42 -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 11/12] staging: r8188eu: remove HW_VAR_CHECK_BSSID Date: Sun, 30 Jan 2022 20:03:20 +0100 Message-Id: <20220130190321.7172-12-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_CHECK_BSSID case in SetHwReg8188EU() is not used. Remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 13 ------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 2 files changed, 14 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 796c898bfb8c..bab76a92ece5 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1122,19 +1122,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) ResumeTxBeacon(Adapter); } break; - case HW_VAR_CHECK_BSSID: - if (*((u8 *)val)) { - rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID= _DATA | RCR_CBSSID_BCN); - } else { - u32 val32; - - val32 =3D rtw_read32(Adapter, REG_RCR); - - val32 &=3D ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN); - - rtw_write32(Adapter, REG_RCR, val32); - } - break; case HW_VAR_MLME_DISCONNECT: /* Set RCR to not to receive data frame when NO LINK state */ /* reject all data frames */ diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 7be5eb2c4a9b..5add8d100da7 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -14,7 +14,6 @@ enum hw_variables { HW_VAR_INIT_RTS_RATE, HW_VAR_BASIC_RATE, HW_VAR_CORRECT_TSF, - HW_VAR_CHECK_BSSID, HW_VAR_MLME_DISCONNECT, HW_VAR_MLME_SITESURVEY, HW_VAR_MLME_JOIN, --=20 2.34.1 From nobody Tue Jun 30 01:42:16 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 15298C433F5 for ; Sun, 30 Jan 2022 19:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355920AbiA3TEr (ORCPT ); Sun, 30 Jan 2022 14:04:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355806AbiA3TDp (ORCPT ); Sun, 30 Jan 2022 14:03:45 -0500 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 723AEC061748 for ; Sun, 30 Jan 2022 11:03:45 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id d10so36046903eje.10 for ; Sun, 30 Jan 2022 11:03:45 -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=xkpzfLZXkf4Cff58Y+MCWi39G/nogDyQTUwKpV7CqzE=; b=AcM7N/PpcJzgUpZ3pWcXxCACuWyBKgDicwdzR1wQY9tnu0tUIOZGEF0BOG4xvBkuzi Uxv8NRoIF3LnhS0W24k+h0LGf9hj0FrKfgIE2yJ5vn02OUIVQF0GysWZp4EuWzM6MK3d YHJ+jgXkKcnIO0QwY3UufJlixPNHmyFbW2/Xm6mmXHL9GtKHBCUFSrft3LCUgyrZ6/tZ QLyBHwmkEumepL80X63i23yJwV0JnOIp84jh+Sh5pnFCgIuHnQu4nzt5VYuTMqhIj89g RbvqIFsvezp9AGJqudUzplYjXu9mkeANRZcSeXnLN6tDvsLdVZuRUHqXc4glzJoym9Xb D2xw== 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=xkpzfLZXkf4Cff58Y+MCWi39G/nogDyQTUwKpV7CqzE=; b=NA+2XcuiIWY1ue1UoLFTWjpeWthOTf2kVN2IwzbThL7T8TtLywt7JGy0xYkA6UQb00 SYT5BLSdOGMtfJQRASuKVeqyL1RWpRbNVqGl8vKZkl2ZXIjbzwz+5vAn1MgcNar0DHmA VIqaAAcvL+FIm9Azsvxh6Uh7hEeJDn2TzTnKRaXgAFpbQpZlnMnyNv7xNP86qKI8Rp5o H+MiKlmmDJkzjxDMAaRToRE3e51aSfbGGP7kbHnFgnIfv32wOJauz2T0ipL/4F0xflzc +/1uUidiClhuzwfobz3OgKDGgoDuxai4dnKmUkioNDlk4vq2MKN5gfAs/U210WfYNnr4 OTlQ== X-Gm-Message-State: AOAM532RJhSfD9x4is1WtDtZCfEhEgNpK6u495uPixN9Tmtw3c4tKaXz D8Mkau1BDJalr0iB/nimzMA= X-Google-Smtp-Source: ABdhPJxClUYmhMwbcglWbNdSaRQ6wu5KPIeYCtpTIecwhVHPk9Y2bk6OVyyxjl0vsgohgSsGMUs+cA== X-Received: by 2002:a17:906:eb89:: with SMTP id mh9mr14643269ejb.399.1643569424019; Sun, 30 Jan 2022 11:03:44 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:43 -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 12/12] staging: r8188eu: remove HW_VAR_CAM_EMPTY_ENTRY Date: Sun, 30 Jan 2022 20:03:21 +0100 Message-Id: <20220130190321.7172-13-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 HW_VAR_CAM_EMPTY_ENTRY case in SetHwReg8188EU() is not used. Remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 23 ---------------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 2 files changed, 24 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index bab76a92ece5..996ded880034 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1272,29 +1272,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) case HW_VAR_DM_FUNC_CLR: podmpriv->SupportAbility &=3D *((u32 *)val); break; - case HW_VAR_CAM_EMPTY_ENTRY: - { - u8 ucIndex =3D *((u8 *)val); - u8 i; - u32 ulCommand =3D 0; - u32 ulContent =3D 0; - u32 ulEncAlgo =3D CAM_AES; - - for (i =3D 0; i < CAM_CONTENT_COUNT; i++) { - /* filled id in CAM config 2 byte */ - if (i =3D=3D 0) - ulContent |=3D (ucIndex & 0x03) | ((u16)(ulEncAlgo) << 2); - else - ulContent =3D 0; - /* polling bit, and No Write enable, and address */ - ulCommand =3D CAM_CONTENT_COUNT * ucIndex + i; - ulCommand =3D ulCommand | CAM_POLLINIG | CAM_WRITE; - /* write content 0 is equall to mark invalid */ - rtw_write32(Adapter, WCAMI, ulContent); /* delay_ms(40); */ - rtw_write32(Adapter, RWCAM, ulCommand); /* delay_ms(40); */ - } - } - break; case HW_VAR_AC_PARAM_BE: haldata->AcParam_BE =3D ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 5add8d100da7..cb460d8a4595 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -25,7 +25,6 @@ enum hw_variables { HW_VAR_DM_FUNC_OP, HW_VAR_DM_FUNC_SET, HW_VAR_DM_FUNC_CLR, - HW_VAR_CAM_EMPTY_ENTRY, HW_VAR_CAM_READ, HW_VAR_AC_PARAM_BE, HW_VAR_ACM_CTRL, --=20 2.34.1