From mboxrd@z Thu Jan 1 00:00:00 1970 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 9E6E9C433EF for ; Thu, 25 Nov 2021 20:01:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350749AbhKYUFD (ORCPT ); Thu, 25 Nov 2021 15:05:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350060AbhKYUDC (ORCPT ); Thu, 25 Nov 2021 15:03:02 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FC04C06175D for ; Thu, 25 Nov 2021 11:59:50 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id 77-20020a1c0450000000b0033123de3425so9204571wme.0 for ; Thu, 25 Nov 2021 11:59:50 -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=N5VMnQudqygsHa96G93xYFbkIJoqADuSCWc5dxeQhpA=; b=JwD2L0dq8UUCbXoIt3GEmIFwD1zz1nMVDjDK/MXrBWQmauIZ+6ujvWYgxBWYqVMUEL FZYN4kjeWfq6yLyfQ567/xbCn2JeCj1veVumhtI23xjTkyNbvHT11PrK+++ZSftm2Hhm 6EZeIujA0i57A/BIt/gUB9wZ6NlMDpLe3RsTAhRQIBWWZKXfvnatlePlp/syL/eQ8p6p C/TbJKM6Q2EZaiGNY/lE397NGMMBpGkUALB9y9rBsgCf1KeH50hjRhgJSvSRxLVlOS9P aRtUOT1sKbxiinUCXidIJOVfoqhYRezUf+Tqc/ansZW7MKy+oCiAQ/SAziQ9OXy0YaCR wdFw== 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=N5VMnQudqygsHa96G93xYFbkIJoqADuSCWc5dxeQhpA=; b=hZjUxtuAo9J5OT6ylARbSRXe69BByi+yeIV/rLAppFdG+E64SsVVBSsynXU7ASIORb ZdoCyXnTvGM70Nw6GUmOq7Iu0piMmJ8K+6ihE1p9V59VOWXFmEFSP4QMhnP9YkRAp0Mf 8Xis4rHav/O03WD/vknyQS6w9IW9iHFCqZup1IIkfT9Epc64rSRABbB7MyJm1QlodDDD jqsoor1NVAaCUy2D23a3P7ldJGF9tjdOQehLokgmfalYw5LoC7hu03yOZI2v6fwkio67 X4dx+Eo1sW2dp3Gj3rDY/wAbpzB8617QMxO8+EH61b1CStl5mxqZDcBqqiEzak6cgxL2 MXvw== X-Gm-Message-State: AOAM531hK4cQ077TC2hZr6VrHVQCLOAFnPe2AP3DZS9lHMP0y1Uw7KDP HTMTRHRHv7yfg5uaBOaJk69zPwpZVBY= X-Google-Smtp-Source: ABdhPJzW0Wil5JAIpg/7HWMMHX+VRGXYKM1wUbLHd03c9QQB1VAjoWt0qJYUmfJpJNtliky8Hb5cdw== X-Received: by 2002:a1c:9851:: with SMTP id a78mr10445965wme.116.1637870388901; Thu, 25 Nov 2021 11:59:48 -0800 (PST) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::ac86]) by smtp.gmail.com with ESMTPSA id h13sm3762721wrx.82.2021.11.25.11.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 11:59:48 -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 1/5] staging: r8188eu: remove rf_type from rtw_update_ht_cap() Date: Thu, 25 Nov 2021 20:59:32 +0100 Message-Id: <20211125195936.10060-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211125195936.10060-1-straube.linux@gmail.com> References: <20211125195936.10060-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org rf_type is always RF_1T1R. Remove it from rtw_update_ht_cap() and remove related dead code. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index 8d14aff32f61..a3996a7ee814 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1999,17 +1999,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) { int i; - u8 rf_type; - - GetHwReg8188EU(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); /* update the MCS rates */ - for (i = 0; i < 16; i++) { - if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - else - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - } + for (i = 0; i < 16; i++) + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; + /* switch to the 40M Hz mode according to the AP */ pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40; switch ((pmlmeinfo->HT_info.infos[0] & 0x3)) { -- 2.33.1