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=-13.3 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_SANE_1 autolearn=unavailable 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 1496EC433DB for ; Mon, 15 Mar 2021 10:16:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAA6864EC4 for ; Mon, 15 Mar 2021 10:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229929AbhCOKQR (ORCPT ); Mon, 15 Mar 2021 06:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229948AbhCOKPz (ORCPT ); Mon, 15 Mar 2021 06:15:55 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E1C8C061574 for ; Mon, 15 Mar 2021 03:15:54 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id o14so4565191wrm.11 for ; Mon, 15 Mar 2021 03:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=mi7e+Xch9BQgQv2YvbhHGhbW0OiQyFlrohsnv1hS94Y=; b=REWKGj6m3kb/GyXtsobkUpv2GEXwPZjX3isS2KXC9X/cECHhgUyE1gP7aFhaDXaDZi MJV1axMnCO16gvugOTcSz/Li+sLWllz+QoI0nJtXc3SfP1NFm8eVdC65vZh4zfAd04nX 14OSku9F744aJJUsGP3owil1If8MxaIcrQFy970/430Gm57+hFqjiy4+4xkDryq+U21i nZUTocpC+wNa5PZQfQF+WiZ6XJU15EJ7rQHJFIiWk898PoAmjZrFxbFRh78IH1G7JIZt R9N2DqSIszkWE85B2WKZvXNxiiTQq642i41KJRbLp3xveGE8DBJv0Q/FH6boOw6jDMW9 4bcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=mi7e+Xch9BQgQv2YvbhHGhbW0OiQyFlrohsnv1hS94Y=; b=LknFOMR9kql1l+ThG6/q6E2/Zn6Coi2Rqbzkl6lyq0u2FkfWmBu8QCvTTPc96oNEr3 eA6x8QmO1p6EI7JGBVn3+E+vTxFgnKgwVhlAYZfGigRsD75E+fKEStr9FesOT7uKsT6w kT23DjKg8c0BpCqpdoVFc3DYNlE/4vBS3JbOkmFTnZmSK3BzcKK1Wc40K/Cz5CmmrHXw N514tQ268FyV69+V8AIgdC9IkC2ne3sxW6xdRWr0yaaLKUZt0vX12S60kSQ2xSgrWt2c RnkZy8mzEVtXDxuXj3AViS+wUC5g03PQ3CXmDKAKhB6ygpjvMkyN+VpcfQ9rbS0pc7TW K0CA== X-Gm-Message-State: AOAM532suOwUIbz0bSDycz3QG9lgQqArbLxfTFyjrWjw84bFlYmmozbg w9gV7qUQEvsCSSeUudDnxeM= X-Google-Smtp-Source: ABdhPJx/8YxmsHoRbvtqJX9wzUxsQJI7OgwOOUvXI8yRlEJ16PCNMAWt5g8TmJRgaLlc3G3WN9P0nw== X-Received: by 2002:a5d:6049:: with SMTP id j9mr26212150wrt.117.1615803353354; Mon, 15 Mar 2021 03:15:53 -0700 (PDT) Received: from agape.jhs ([5.171.72.229]) by smtp.gmail.com with ESMTPSA id c11sm18621568wrm.67.2021.03.15.03.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 03:15:53 -0700 (PDT) Date: Mon, 15 Mar 2021 11:15:50 +0100 From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/15] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SKIP_SIGNAL_SCALE_MAPPING Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org remove conditional code blocks checked by unused CONFIG_SKIP_SIGNAL_SCALE_MAPPING cleaning required in TODO file: find and remove code blocks guarded by never set CONFIG_FOO defines Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 9 -------- drivers/staging/rtl8723bs/include/rtw_recv.h | 5 ----- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 21 ------------------- 3 files changed, 35 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c index de63e4a2932e..5f2f17b49173 100644 --- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c @@ -226,19 +226,10 @@ static void odm_RxPhyStatus92CSeries_Parsing( /* UI BSS List signal strength(in percentage), make it good looking, from 0~100. */ /* It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). */ if (isCCKrate) { -#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING - pPhyInfo->SignalStrength = (u8)PWDB_ALL; -#else pPhyInfo->signal_strength = (u8)(odm_SignalScaleMapping(pDM_Odm, PWDB_ALL));/* PWDB_ALL; */ -#endif } else { if (rf_rx_num != 0) { -#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING - total_rssi /= rf_rx_num; - pPhyInfo->signal_strength = (u8)total_rssi; -#else pPhyInfo->signal_strength = (u8)(odm_SignalScaleMapping(pDM_Odm, total_rssi /= rf_rx_num)); -#endif } } diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 484e9d62ef92..0a56c3a66ee8 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -512,14 +512,9 @@ static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) { s32 SignalPower; /* in dBm. */ -#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING - /* Translate to dBm (x =y-100) */ - SignalPower = SignalStrengthIndex - 100; -#else /* Translate to dBm (x = 0.5y-95). */ SignalPower = (s32)((SignalStrengthIndex + 1) >> 1); SignalPower -= 95; -#endif return SignalPower; } diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index b6ae7dfc51fe..d0e77465ad9a 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -325,17 +325,7 @@ static char *translate_scan(struct adapter *padapter, } - #ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING - { - /* Do signal scale mapping when using percentage as the unit of signal strength, since the scale mapping is skipped in odm */ - - struct hal_com_data *pHal = GET_HAL_DATA(padapter); - - iwe.u.qual.level = (u8)odm_SignalScaleMapping(&pHal->odmpriv, ss); - } - #else iwe.u.qual.level = (u8)ss;/* */ - #endif iwe.u.qual.qual = (u8)sq; /* signal quality */ @@ -4691,18 +4681,7 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev) piwstats->qual.noise = 0; /* DBG_871X("No link level:%d, qual:%d, noise:%d\n", tmp_level, tmp_qual, tmp_noise); */ } else { - #ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING - { - /* Do signal scale mapping when using percentage as the unit of signal strength, since the scale mapping is skipped in odm */ - - struct hal_com_data *pHal = GET_HAL_DATA(padapter); - - tmp_level = (u8)odm_SignalScaleMapping(&pHal->odmpriv, padapter->recvpriv.signal_strength); - } - #else tmp_level = padapter->recvpriv.signal_strength; - #endif - tmp_qual = padapter->recvpriv.signal_qual; tmp_noise = padapter->recvpriv.noise; DBG_871X("level:%d, qual:%d, noise:%d, rssi (%d)\n", tmp_level, tmp_qual, tmp_noise, padapter->recvpriv.rssi); -- 2.20.1