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=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 C4428C432BE for ; Sat, 7 Aug 2021 09:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A94A361185 for ; Sat, 7 Aug 2021 09:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231952AbhHGJtD (ORCPT ); Sat, 7 Aug 2021 05:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231796AbhHGJsu (ORCPT ); Sat, 7 Aug 2021 05:48:50 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1472C06179C for ; Sat, 7 Aug 2021 02:48:32 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id b11so14348698wrx.6 for ; Sat, 07 Aug 2021 02:48:32 -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=sisHZ1HhRCasFIE/noc0qjfPi9WbEki57MFY3ucpKDM=; b=UIFxBgN75Mtqw4f/Uo83Ee658k58wj0efRZRHLck0eU12wHHjLc/2BTxljrVCLZaIH +ueIPSaEZRouXsbaClYp8Ewhw++fMphTcZCh918DK9UH2B2tYW5Ss98ZycxozlBQQlUa NSaz9dBCifyfW8YHsifbglt1eEpQwr+NoVa2KlKaO64KeuVx+eqD0L+bf9dL1ZO9hbT8 5SwBnbWLL6TMwupIf9mG6mPNmb7mqtn0xqieQCX3/VRzGCVWEvDEclLAuEv4Gn+uIL4T KxUQKpBxOBdORZmgIo++efFE8gL9Dql3xZ4AMx98PTO83zySPm4/sznlRFllvRDOQ2A5 7eAQ== 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=sisHZ1HhRCasFIE/noc0qjfPi9WbEki57MFY3ucpKDM=; b=e1LItEEbk/7vT95wg0EsUJAopF1we+mAfOiu8rph8k0CXDCB1kfgb61ay6pbYPeX9e qHgUk8GEV/z+C6s9my15/czFO50z6uTsR8zMWwY84qwKpy2xchEdiEOtxIOS3pr+lDlo tPCjamZrWFmBY+MXp/6eaIMr2uY9ttb+CuoUIyPdy/SszB5GoRtIOGSUtBA77yVbYj9+ MylpGaAs0SPR2NqTRCWUcjhJkVbRQhplrzOVjb5hwCUcUDNNoZ6X877KMzdC96ljdwDk epKYRXlyYWEo0I0FrL2xztZNxxTI8Zxf2IUt2fQLpOme1/w1wkyYluAs7ioLkx707RjN aoXQ== X-Gm-Message-State: AOAM531MEQwAd0DBQXW4XpY6fSOOJJ8zGOu5jvoAJn/8PSZiFsqr555K HclebI2YLbvnwNdLAQ9UlpIfDPrFuo8= X-Google-Smtp-Source: ABdhPJzxSOU0NhRqIO+qCfgQyhQrJ005nuQqrX62ffMu6UxXsOXmgHXcZzZYgE6D6PONGe93xt/DxQ== X-Received: by 2002:a5d:5751:: with SMTP id q17mr14890162wrw.48.1628329711310; Sat, 07 Aug 2021 02:48:31 -0700 (PDT) Received: from agape ([5.171.80.112]) by smtp.gmail.com with ESMTPSA id b14sm12964427wrm.43.2021.08.07.02.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 02:48:31 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 12/21] staging: rtl8723bs: remove rf type branching (first patch) Date: Sat, 7 Aug 2021 11:48:04 +0200 Message-Id: <72ce98106bb172fce0f43315bc4dbbb7065afef5.1628329348.git.fabioaiuto83@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org remove rf type branching, for the baseband works only on 1T1R rf type, so just keep code branches related to 1T1R. Remove RFType from hal_version struct, and all related code. Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/hal/hal_com.c | 10 +--------- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 8 +------- drivers/staging/rtl8723bs/include/HalVerDef.h | 18 ------------------ 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c index 7dd49c8538e4..65987e3076a3 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -70,15 +70,7 @@ void dump_chip_info(struct hal_version ChipVersion) cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "UNKNOWN_CUT(%d)_", ChipVersion.CUTVersion); - if (IS_1T1R(ChipVersion)) - cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "1T1R_"); - else if (IS_1T2R(ChipVersion)) - cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "1T2R_"); - else if (IS_2T2R(ChipVersion)) - cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "2T2R_"); - else - cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, - "UNKNOWN_RFTYPE(%d)_", ChipVersion.RFType); + cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "1T1R_"); cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "RomVer(%d)\n", ChipVersion.ROMVer); } diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index ce4f81828a65..5da8e21bb02f 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1640,7 +1640,6 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) value32 = rtw_read32(padapter, REG_SYS_CFG); ChipVersion.ICType = CHIP_8723B; ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP); - ChipVersion.RFType = RF_TYPE_1T1R; ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC); ChipVersion.CUTVersion = (value32 & CHIP_VER_RTL_MASK)>>CHIP_VER_RTL_SHIFT; /* IC version (CUT) */ @@ -1661,12 +1660,7 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) dump_chip_info(ChipVersion); #endif pHalData->VersionID = ChipVersion; - if (IS_1T2R(ChipVersion)) - pHalData->rf_type = RF_1T2R; - else if (IS_2T2R(ChipVersion)) - pHalData->rf_type = RF_2T2R; - else - pHalData->rf_type = RF_1T1R; + pHalData->rf_type = RF_1T1R; return ChipVersion; } diff --git a/drivers/staging/rtl8723bs/include/HalVerDef.h b/drivers/staging/rtl8723bs/include/HalVerDef.h index bab226f77b24..8f654a49fb9d 100644 --- a/drivers/staging/rtl8723bs/include/HalVerDef.h +++ b/drivers/staging/rtl8723bs/include/HalVerDef.h @@ -50,23 +50,11 @@ enum hal_vendor_e { /* tag_HAL_Manufacturer_Version_Definition */ CHIP_VENDOR_SMIC = 2, }; -enum hal_rf_type_e { /* tag_HAL_RF_Type_Definition */ - RF_TYPE_1T1R = 0, - RF_TYPE_1T2R = 1, - RF_TYPE_2T2R = 2, - RF_TYPE_2T3R = 3, - RF_TYPE_2T4R = 4, - RF_TYPE_3T3R = 5, - RF_TYPE_3T4R = 6, - RF_TYPE_4T4R = 7, -}; - struct hal_version { /* tag_HAL_VERSION */ enum hal_ic_type_e ICType; enum hal_chip_type_e ChipType; enum hal_cut_version_e CUTVersion; enum hal_vendor_e VendorType; - enum hal_rf_type_e RFType; u8 ROMVer; }; @@ -76,7 +64,6 @@ struct hal_version { /* tag_HAL_VERSION */ /* Get element */ #define GET_CVID_IC_TYPE(version) ((enum hal_ic_type_e)((version).ICType)) #define GET_CVID_CHIP_TYPE(version) ((enum hal_chip_type_e)((version).ChipType)) -#define GET_CVID_RF_TYPE(version) ((enum hal_rf_type_e)((version).RFType)) #define GET_CVID_MANUFACTUER(version) ((enum hal_vendor_e)((version).VendorType)) #define GET_CVID_CUT_VERSION(version) ((enum hal_cut_version_e)((version).CUTVersion)) #define GET_CVID_ROM_VERSION(version) (((version).ROMVer) & ROM_VERSION_MASK) @@ -105,9 +92,4 @@ struct hal_version { /* tag_HAL_VERSION */ #define IS_CHIP_VENDOR_UMC(version) ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? true : false) #define IS_CHIP_VENDOR_SMIC(version) ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_SMIC) ? true : false) -/* hal_rf_type_e */ -#define IS_1T1R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T1R) ? true : false) -#define IS_1T2R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false) -#define IS_2T2R(version) ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false) - #endif -- 2.20.1