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 X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35A9BC47425 for ; Tue, 29 Sep 2020 06:32:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F30E12083B for ; Tue, 29 Sep 2020 06:32:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jxS1on7t" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727454AbgI2Gcr (ORCPT ); Tue, 29 Sep 2020 02:32:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726432AbgI2Gck (ORCPT ); Tue, 29 Sep 2020 02:32:40 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B12F0C061755 for ; Mon, 28 Sep 2020 23:32:39 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id h26so3249964ejq.3 for ; Mon, 28 Sep 2020 23:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ul2wZJxRqrBtE7LWlBmriygJxCT0ta6IFh4PpqbYxrU=; b=jxS1on7tg/23h5fl7fBqBYc58LVwjeD7JelI3ofTe/RdU4jsAaiExT2v1P1/BWdnuv Ug6YHxFdXuafQtgrEBgAblLPRDwUk2I63esavAcYhukmh1Z2P/2QewrksAnuhZoEgTJP oliY7ntuyUgk0SXIV/5kbcXzYwiB9OAOm/4e0hjxPAqz43ukyKvtyqVq+ST1aqhf2Iip Ytk+tXgk6F7GLH8tdHsfVljqjpaGoW2qol13MJXft6swO0UUSzL+8gDj+htD37JlqBjM HUyt8D7QRUD/SaurizeT0OQeBUzDSB+T/nJbWL0Hy3OllmOgmi0Cl54Zhh8aVjAUzCkz Ws1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ul2wZJxRqrBtE7LWlBmriygJxCT0ta6IFh4PpqbYxrU=; b=a8DHk9RETZQMdijx/p45fpXMQQ5EZlym/HbV4uRZzZN4PMxmRMoM4JK7uOm+FvdUce m5qmv2+Y4h0lK4H7rqjTGRr3bXihuCfGDL5SZczrM6IkMkvJIRsKY40NknkgWJLTKqPU rR2KObLbU+wY41kVhHk5w+BhxNfQVjVS6gR4HvmwQjTUvMsgd4UM0oyg8hYjOYy/orrK k+84vEOd1I27zGwsuOAC2AkpCwfERKLdCLco9lTFDXEEkGiYJsy4Gq7f7dw0CEZd09hZ jnNx+O5fp2ybAB4ndYJOTa1IfmS906UnXgnO1qK6U9B8b/nh2gD1KlLloEFxNHcpZ7Rd t3LQ== X-Gm-Message-State: AOAM532jrbaUpXlOgvO6xXAr69dKapI5SBTmp5Hghmok+KY2o2S6tCdP 7n7r+w9gm0slNpJEEz1xYmM= X-Google-Smtp-Source: ABdhPJyKnCwiKp5qH7fOKxr5pd+ReYdsVL3286y2BsZAmAauX3RG9Zmg4WRYDbTWOD6JhhDzdnwvEg== X-Received: by 2002:a17:906:bc92:: with SMTP id lv18mr1514807ejb.479.1601361158461; Mon, 28 Sep 2020 23:32:38 -0700 (PDT) Received: from localhost.localdomain (ipservice-092-219-207-039.092.219.pools.vodafone-ip.de. [92.219.207.39]) by smtp.gmail.com with ESMTPSA id r8sm4730915edy.87.2020.09.28.23.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 23:32:37 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 7/8] staging: rtl8188eu: remove unused variable ratelen Date: Tue, 29 Sep 2020 08:28:46 +0200 Message-Id: <20200929062847.23985-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929062847.23985-1-straube.linux@gmail.com> References: <20200929062847.23985-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 After the removal of cckrates_included() and cckrates_only_included() from rtw_wlan_util.c the variable/parameter 'ratelen' is unused now. Remove it from update_wireless_mode() and judge_network_type(). Signed-off-by: Michael Straube --- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 6 ++---- drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 ++-- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c index bf7dd13dde03..8e8f1721b1a2 100644 --- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c @@ -76,7 +76,7 @@ unsigned char networktype_to_raid(unsigned char network_type) } } -u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen) +u8 judge_network_type(struct adapter *padapter, unsigned char *rate) { u8 network_type = 0; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -1321,15 +1321,13 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) void update_wireless_mode(struct adapter *padapter) { - int ratelen, network_type = 0; + int network_type = 0; u32 SIFS_Timer; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; unsigned char *rate = cur_network->SupportedRates; - ratelen = rtw_get_rateset_len(cur_network->SupportedRates); - if (pmlmeinfo->HT_info_enable && pmlmeinfo->HT_caps_enable) pmlmeinfo->HT_enable = 1; diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index 5e7bb22d7d01..abe58cf2de16 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -1893,7 +1893,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level) switch (mac_id) { case 0:/* for infra mode */ supportRateNum = rtw_get_rateset_len(cur_network->SupportedRates); - networkType = judge_network_type(adapt, cur_network->SupportedRates, supportRateNum) & 0xf; + networkType = judge_network_type(adapt, cur_network->SupportedRates) & 0xf; raid = networktype_to_raid(networkType); mask = update_supported_rate(cur_network->SupportedRates, supportRateNum); mask |= (pmlmeinfo->HT_enable) ? update_MSC_rate(&pmlmeinfo->HT_caps) : 0; @@ -1911,7 +1911,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level) break; default: /* for each sta in IBSS */ supportRateNum = rtw_get_rateset_len(pmlmeinfo->FW_sta_info[mac_id].SupportedRates); - networkType = judge_network_type(adapt, pmlmeinfo->FW_sta_info[mac_id].SupportedRates, supportRateNum) & 0xf; + networkType = judge_network_type(adapt, pmlmeinfo->FW_sta_info[mac_id].SupportedRates) & 0xf; raid = networktype_to_raid(networkType); mask = update_supported_rate(cur_network->SupportedRates, supportRateNum); diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h index 713e23229ef5..b11a6886a083 100644 --- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h @@ -448,7 +448,7 @@ void init_addba_retry_timer(struct adapter *adapt, struct sta_info *sta); struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); unsigned char networktype_to_raid(unsigned char network_type); -u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int len); +u8 judge_network_type(struct adapter *padapter, unsigned char *rate); void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *len); void UpdateBrateTbl(struct adapter *padapter, u8 *mBratesOS); void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen); -- 2.28.0