From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61CC12FB3 for ; Sun, 30 Jan 2022 19:03:40 +0000 (UTC) Received: by mail-ej1-f41.google.com with SMTP id ka4so35975092ejc.11 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=HeO+FiAYJYYcj4EUDvhnwunGeoFMymaIvRPgIjJsFLUULHZjbVdhtzjRoHUiexnVLC ddGgWqWeKWQIDl74K8hHo+fr9i3Uo/gbz6PLo/5sigUwbxeJsExE26WIdUnNe9Vl8D3t EnqRIPqfdvj0aT6zqC156DyItC62WTOsJwPHu8E2Dn3RqA0PGKE1ufbKn/7B3upZYFuz 3WT1JJvHLmZvuT8KCFb8OzMD/mvFxtzz+g8NnWgo8avP1VsPtWIhq6sa8c0E0aH7TCCl nISTTL7D3+GQTibTB0WcLHboLM+ZjSn+b++n9JPwduSlTN2NnveKYdqMeta+4KdGiBpZ ICiA== X-Gm-Message-State: AOAM5303nQ8UEZwkV0TyegNLZSFNXpDz0z0bH70/oscW3+m0Viiz5lnx LDRbixEUfLLFy9ZNBeEWQDQ= 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> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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] = 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] = acParm; break; case 0x2: diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/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 variable, u8 *val) haldata->AcParam_BE = ((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 = *((u8 *)val); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/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, -- 2.34.1