From patchwork Sun Apr 16 19:04:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9683091 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CE2660138 for ; Sun, 16 Apr 2017 19:04:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 811C82793A for ; Sun, 16 Apr 2017 19:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75FCE27DA4; Sun, 16 Apr 2017 19:04:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID, URIBL_BLACK autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C2DB2793A for ; Sun, 16 Apr 2017 19:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756709AbdDPTEv (ORCPT ); Sun, 16 Apr 2017 15:04:51 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:35019 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756597AbdDPTEs (ORCPT ); Sun, 16 Apr 2017 15:04:48 -0400 Received: by mail-oi0-f66.google.com with SMTP id a21so8126927oic.2 for ; Sun, 16 Apr 2017 12:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7EJpgX7fKH5npZS0AdhpdX5ZSyrw30/LHModdjxwHTs=; b=Z6tiN1WSK+vYNq6pXng567j5UbrTNjqCkH7D6YMt0quO2rUmX9+6B53WLhdHYbjSht xSpJlfJp+FX3s9u+R60/739Cj5YlFNICQZKxAhTC5KPQJ5TPS7O8e8gE/WVFd2EuwNoD u9N+omfIz1GEmilOGo/gRrmEJGdteCyvPHYUMYBih9oYPh5a17j0G/2jQDDI3I4BNJHW OV/q0jd3hCcuUdZJCK0quUIi03eYToA81b2tkIAcpCaT1EFvQk0iaHwKAHkSKxm+nj65 wuFLTRNG9K3RPbNMROVu9j7pPbyKlKD9rYSwe6iOwB0Qvcbtq+826N0aPZv+Ht3zNo5c 3gnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7EJpgX7fKH5npZS0AdhpdX5ZSyrw30/LHModdjxwHTs=; b=ckvF+1CU9cpr3Rx0tT72C20xt/9KrRD2h8n1BIAU2d2FWH3iiALyr2LDXv7Gdimpxa C/IkpdF+d1Z059YfS/GfIAztFLroxkYq3AQAtvJyaZyupqmuScNB5jwdDfRpJ/PutQZ/ Qpy+ych5BQGaVcBqXZFoVDmOR4oB1lXepi3gjt3VhHyt9LW7k/HQiupMb3FKC7S3MD4s O8HUAUCYnPg5DUh1ej7FQAso41CZ3HEOANybgoHHTs0msCjrqg0EbXx4VvFE67nQTFUq Kw2W4GiQQBiGUV5vuUsPY9TmCKKUdqKSxw3N2shsZ6u2sb0sGLbtqVaD9i+RCGbjtlSg 1NaQ== X-Gm-Message-State: AN3rC/5Ddxv2fu91pBfPbaHRCRF0xXWHdblyOHWa2xuK+YN+7WP62aoL /sG0c42MrOoJxw== X-Received: by 10.157.63.70 with SMTP id m64mr3622730otc.273.1492369483003; Sun, 16 Apr 2017 12:04:43 -0700 (PDT) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id y185sm3709022oig.1.2017.04.16.12.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Apr 2017 12:04:42 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Yan-Hsuan Chuang , Larry Finger , Pkshih , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH 10/10] rtlwifi: btcoex: 21a 2ant: remove unused antenna detection variables Date: Sun, 16 Apr 2017 14:04:28 -0500 Message-Id: <20170416190428.23857-11-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170416190428.23857-1-Larry.Finger@lwfinger.net> References: <20170416190428.23857-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Yan-Hsuan Chuang PSD and LNA are for antenna detection, but we do not use them for 8821A. Remove them and the corresponding display messages. Signed-off-by: Yan-Hsuan Chuang Signed-off-by: Larry Finger Cc: Pkshih Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- .../wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 13 ------------- .../wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h | 4 ---- 2 files changed, 17 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c index e61016f660a8..3b4c892fc233 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c @@ -3747,14 +3747,6 @@ void ex_btc8821a2ant_display_coex_info(struct btc_coexist *btcoexist) ((BTC_WIFI_TRAFFIC_TX == wifi_traffic_dir) ? "uplink" : "downlink"))); - RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, - "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]", - ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") : - ((BT_8821A_2ANT_BT_STATUS_IDLE == coex_dm->bt_status) - ? "idle" : ((BT_8821A_2ANT_BT_STATUS_CON_IDLE == - coex_dm->bt_status) ? "connected-idle" : "busy"))), - coex_sta->bt_rssi, coex_sta->bt_retry_cnt); - if (stack_info->profile_notified) { RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d / %d / %d / %d", "SCO/HID/PAN/A2DP", @@ -3790,11 +3782,6 @@ void ex_btc8821a2ant_display_coex_info(struct btc_coexist *btcoexist) RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s", "============[Sw mechanism]============"); RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, - "\r\n %-35s = %d/ %d/ %d/ %d ", - "SM1[ShRf/ LpRA/ LimDig/ btLna]", - coex_dm->cur_rf_rx_lpf_shrink, coex_dm->cur_low_penalty_ra, - coex_dm->limited_dig, coex_dm->cur_bt_lna_constrain); - RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d/ %d(0x%x) ", "SM2[AgcT/ AdcB/ SwDacSwing(lvl)]", coex_dm->cur_agc_table_en, coex_dm->cur_adc_back_off, diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h index 74edfd75875a..a1603e2d44e3 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h @@ -79,10 +79,6 @@ struct coex_dm_8821a_2ant { /* fw mechanism */ bool pre_dec_bt_pwr_lvl; bool cur_dec_bt_pwr_lvl; - bool pre_bt_lna_constrain; - bool cur_bt_lna_constrain; - u8 pre_bt_psd_mode; - u8 cur_bt_psd_mode; u8 pre_fw_dac_swing_lvl; u8 cur_fw_dac_swing_lvl; bool cur_ignore_wlan_act;