From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 3EF1A6D1B for ; Fri, 13 Aug 2021 07:32:02 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id l18so11972314wrv.5 for ; Fri, 13 Aug 2021 00:32:02 -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=oWgTAW0kExPJoTtfAVDIWDbUQSLrhJpY47hv1up2zc8=; b=ng9LrTs5VkR1F72sPWin2RUKSgK9af2K0bcwTilEqgTW3GcSSPnksnhriQUCL8uw5q +PSbho4VguP7pd2Pm76z0hYHjcESbvgeCoTB1paroM/gtUCkUsrrzroa0gAX3BYHtf90 RSrFD5OfpTvXCKzSSEjwlxbvu1Mrp4bqIYUpVK9L4lTxGJt0GQO9EpQJNgn8Q6nzELMC mDEVpmGvCYc0M/8M1i4OfNpISC1UHG2nKOQjY69VSW7X7wcsX5eq1rCI04SBMmTZ+4wI cbIk6NTtdc2Z2U+Pv9RV/ZrIylylbNhmQJTtQTEX3uEocBa6Mna2ui459zq+EKwQD4g7 deSw== 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=oWgTAW0kExPJoTtfAVDIWDbUQSLrhJpY47hv1up2zc8=; b=oUObHOn5G58TqjsTFWUk5WeUIzRd7wx7PTVasyu27zNZPPcDHxmmNTe1PHJRmrQUU2 /+pES0DF0QitYsPtGx5yhb/pBVWR7EhYVPn/6YZ3BaRlyK9zal8orHUfUooI0eObgVQq NnZrWI/UEGEN3K+uCdkgl1BqQVwdQIeag3Czk2uhR+Kvv+XGiUbX7YTgBgaV0kSPla0G e8J/SmYF07Sy2e0orZYPAOfsX4OyQzH4V2rhrlXQ2hVjoHLy5DeAYYeTMYPROKKDM5Pd er0V+agvsBk9lo/m3uBq4fyTIue+wCCrNo3CApuFibdUyaEN3MRfixz/wDNJHVZk/r44 T2mA== X-Gm-Message-State: AOAM5308fBTVxsfL2z49/Sk1JLO6I0Gm24NcJLj9Wj4oi1px4DQmKUe5 ZNgqcmZQdY+RyT8UdrWRDeY= X-Google-Smtp-Source: ABdhPJwEvmRvLanBtFnrUxA+a4iec6OsIVZaG8ShuJBzMKfTjReWis6H2uIQA9ohZQXkLCAK+j4shQ== X-Received: by 2002:a5d:5985:: with SMTP id n5mr1425047wri.394.1628839920745; Fri, 13 Aug 2021 00:32:00 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::2571]) by smtp.gmail.com with ESMTPSA id k12sm697406wrd.75.2021.08.13.00.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 00:32:00 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/4] staging: r8188eu: remove 5GHz code from Hal_GetChnlGroup88E() Date: Fri, 13 Aug 2021 09:31:06 +0200 Message-Id: <20210813073109.25609-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210813073109.25609-1-straube.linux@gmail.com> References: <20210813073109.25609-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 5GHz code from Hal_GetChnlGroup88E(). Signed-off-by: Michael Straube --- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 62 +++++-------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index f0560c15387c..634a0a022727 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -2062,54 +2062,20 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct txpowerinfo24g *pwrInfo24G, static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup) { - u8 bIn24G = true; - - if (chnl <= 14) { - bIn24G = true; - - if (chnl < 3) /* Channel 1-2 */ - *pGroup = 0; - else if (chnl < 6) /* Channel 3-5 */ - *pGroup = 1; - else if (chnl < 9) /* Channel 6-8 */ - *pGroup = 2; - else if (chnl < 12) /* Channel 9-11 */ - *pGroup = 3; - else if (chnl < 14) /* Channel 12-13 */ - *pGroup = 4; - else if (chnl == 14) /* Channel 14 */ - *pGroup = 5; - } else { - bIn24G = false; - - if (chnl <= 40) - *pGroup = 0; - else if (chnl <= 48) - *pGroup = 1; - else if (chnl <= 56) - *pGroup = 2; - else if (chnl <= 64) - *pGroup = 3; - else if (chnl <= 104) - *pGroup = 4; - else if (chnl <= 112) - *pGroup = 5; - else if (chnl <= 120) - *pGroup = 5; - else if (chnl <= 128) - *pGroup = 6; - else if (chnl <= 136) - *pGroup = 7; - else if (chnl <= 144) - *pGroup = 8; - else if (chnl <= 153) - *pGroup = 9; - else if (chnl <= 161) - *pGroup = 10; - else if (chnl <= 177) - *pGroup = 11; - } - return bIn24G; + if (chnl < 3) /* Channel 1-2 */ + *pGroup = 0; + else if (chnl < 6) /* Channel 3-5 */ + *pGroup = 1; + else if (chnl < 9) /* Channel 6-8 */ + *pGroup = 2; + else if (chnl < 12) /* Channel 9-11 */ + *pGroup = 3; + else if (chnl < 14) /* Channel 12-13 */ + *pGroup = 4; + else if (chnl == 14) /* Channel 14 */ + *pGroup = 5; + + return true; } void Hal_ReadPowerSavingMode88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail) -- 2.32.0