From patchwork Fri May 26 18:41:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9750981 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 159AF60209 for ; Fri, 26 May 2017 18:42:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08D1328294 for ; Fri, 26 May 2017 18:42:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F19B0283D9; Fri, 26 May 2017 18:42:09 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 3E20328294 for ; Fri, 26 May 2017 18:42:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754168AbdEZSmF (ORCPT ); Fri, 26 May 2017 14:42:05 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:35511 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1948601AbdEZSmA (ORCPT ); Fri, 26 May 2017 14:42:00 -0400 Received: by mail-oi0-f66.google.com with SMTP id v80so2985986oie.2 for ; Fri, 26 May 2017 11:42:00 -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=LUvJRc4f3t29yBHuvPmYTl0moYDfHiAagLxBNHHUAJQ=; b=oxPK8/FiUi+LMH56FfnPo2MRArWuiSykmN8jHxX9hLQhhTCAROoVxfx3k8sCRNNXr/ KxZQSPN3ejj6Sc0SIRbZ97+E7svYkSsYwF0GYrjOvmsx3l8o2mVqRnr5L3Qg/XL9uFwz Vo7njlSVDlXQTFBgtnjxbJd6qw5TotUTffcfHzb5AO/gajU+bmmIGfcBWnm3eZdzcJtg Cf7suS88IHevgU9IWJ07PySEPKCH4wO4ONPr8DQzDfVzSajYzvZLaN0NwyBW6dE4//hk 4RoWhsOn7R/ANq5OoiD2hQXFiqpmFvqa2GxVs2Nq8vy+593kYU9dAmqbcruGjd4KYjgZ ZBpQ== 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=LUvJRc4f3t29yBHuvPmYTl0moYDfHiAagLxBNHHUAJQ=; b=O1dD7VYLrJ9ELKvrxXnkpY9Onqbg7dZ8NuTys6K2cYYPhDyf0SmhnjVo8AnKtDE7oh MrZuFodVdt9c+tsBn3pr0GUS8daW9JQQ+6AbPbUAncmqb8jw9frYAkM2kTPGvSISJqyQ t136f2aLdlQzxO3gaHCqlnEpie9nEEQ+/XGVaulQ3/yXg1WJl9nSp9AMTDf7I29zmthN ZgtdMPzxIGyBoaJY8J+RPRsAlI+fUGVPlHpFT3Czx1Ik0IzunumtyApq6GsNnpxCGaZ6 Xd7HsDNej0b8BitMUMSkFbllt57r8Lf3ha1fGgCP9nhOsxSBuF6MBGCRcqX+2RZk1KzE uJDw== X-Gm-Message-State: AODbwcDH3jIuyrkUH03bdEdvgJTVlG3xyvQf9f7XGLG0IMtKzbMjFlZz k+p8sKdc12E2Pg== X-Received: by 10.157.43.24 with SMTP id o24mr1909152otb.64.1495824120031; Fri, 26 May 2017 11:42:00 -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 c50sm665528ote.29.2017.05.26.11.41.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 May 2017 11:41:59 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Larry Finger , Yan-Hsuan Chuang , Ping-Ke Shih , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH v2 5/7] rtlwifi: btcoex: Fix Sparse messages for undeclared symbols Date: Fri, 26 May 2017 13:41:45 -0500 Message-Id: <20170526184147.31239-6-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170526184147.31239-1-Larry.Finger@lwfinger.net> References: <20170526184147.31239-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 A number of functions can be set to static. Signed-off-by: Larry Finger Cc: Yan-Hsuan Chuang Cc: Ping-Ke Shih Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- v2 - no changes --- .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 1 + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 1 + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 1 + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 84 ++-------------------- 4 files changed, 8 insertions(+), 79 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c index de536b184571..db68793fc55c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c @@ -1442,6 +1442,7 @@ static void halbtc8723b1ant_ps_tdma(struct btc_coexist *btcoexist, coex_dm->pre_ps_tdma = coex_dm->cur_ps_tdma; } +static void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist, u8 wifi_status) { diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c index 31965f0ef69d..014df3f8020f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c @@ -833,6 +833,7 @@ static void btc8723b2ant_set_sw_fulltime_dac_swing(struct btc_coexist *btcoex, btc8723b2ant_set_dac_swing_reg(btcoex, 0x18); } +static void btc8723b2ant_dac_swing(struct btc_coexist *btcoexist, bool force_exec, bool dac_swing_on, u32 dac_swing_lvl) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c index c27488f77573..4c7df8860f4d 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c @@ -1517,6 +1517,7 @@ static void btc8821a2ant_action_bt_inquiry(struct btc_coexist *btcoexist) btc8821a2ant_sw_mechanism2(btcoexist, false, false, false, 0x18); } +static void btc8821a2ant_action_wifi_link_process(struct btc_coexist *btcoexist) { struct rtl_priv *rtlpriv = btcoexist->adapter; diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index f00d6e6ab69b..4d3e9b920d69 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -24,6 +24,7 @@ ******************************************************************************/ #include "halbt_precomp.h" +#include "rtl_btc.h" /*********************************************** * Global variables @@ -37,19 +38,6 @@ u32 btc_dbg_type[BTC_MSG_MAX]; * Debug related function ***************************************************/ -const char *const gl_btc_wifi_bw_string[] = { - "11bg", - "HT20", - "HT40", - "HT80", - "HT160" -}; - -const char *const gl_btc_wifi_freq_string[] = { - "2.4G", - "5G" -}; - static bool halbtc_is_bt_coexist_available(struct btc_coexist *btcoexist) { if (!btcoexist->binded || NULL == btcoexist->adapter) @@ -313,7 +301,7 @@ static u32 halbtc_get_bt_patch_version(struct btc_coexist *btcoexist) return 0; } -u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist) +static u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist) { /* return value: * [31:16] => connected port number @@ -671,6 +659,7 @@ static void halbtc_write_4byte(void *bt_context, u32 reg_addr, u32 data) rtl_write_dword(rtlpriv, reg_addr, data); } +static void halbtc_write_local_reg_1byte(void *btc_context, u32 reg_addr, u8 data) { struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context; @@ -684,22 +673,6 @@ void halbtc_write_local_reg_1byte(void *btc_context, u32 reg_addr, u8 data) rtl_write_byte(rtlpriv, reg_addr, data); } -void halbtc_set_macreg(void *btc_context, u32 reg_addr, u32 bit_mask, u32 data) -{ - struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context; - struct rtl_priv *rtlpriv = btcoexist->adapter; - - rtl_set_bbreg(rtlpriv->mac80211.hw, reg_addr, bit_mask, data); -} - -u32 halbtc_get_macreg(void *btc_context, u32 reg_addr, u32 bit_mask) -{ - struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context; - struct rtl_priv *rtlpriv = btcoexist->adapter; - - return rtl_get_bbreg(rtlpriv->mac80211.hw, reg_addr, bit_mask); -} - static void halbtc_set_bbreg(void *bt_context, u32 reg_addr, u32 bit_mask, u32 data) { @@ -745,6 +718,7 @@ static void halbtc_fill_h2c_cmd(void *bt_context, u8 element_id, cmd_len, cmd_buf); } +static void halbtc_set_bt_reg(void *btc_context, u8 reg_type, u32 offset, u32 set_val) { struct btc_coexist *btcoexist = (struct btc_coexist *)btc_context; @@ -776,7 +750,7 @@ void halbtc_set_bt_reg(void *btc_context, u8 reg_type, u32 offset, u32 set_val) } } -bool halbtc_under_ips(struct btc_coexist *btcoexist) +static bool halbtc_under_ips(struct btc_coexist *btcoexist) { struct rtl_priv *rtlpriv = btcoexist->adapter; struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv); @@ -884,34 +858,6 @@ bool exhalbtc_bind_bt_coex_withadapter(void *adapter) return true; } -void exhalbtc_power_on_setting(struct btc_coexist *btcoexist) -{ - if (!halbtc_is_bt_coexist_available(btcoexist)) - return; - - btcoexist->statistics.cnt_power_on++; - - if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) { - if (btcoexist->board_info.btdm_ant_num == 2) - ex_btc8723b2ant_power_on_setting(btcoexist); - else if (btcoexist->board_info.btdm_ant_num == 1) - ex_btc8723b1ant_power_on_setting(btcoexist); - } -} - -void exhalbtc_pre_load_firmware(struct btc_coexist *btcoexist) -{ - if (!halbtc_is_bt_coexist_available(btcoexist)) - return; - - btcoexist->statistics.cnt_pre_load_firmware++; - - if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) { - if (btcoexist->board_info.btdm_ant_num == 2) - ex_btc8723b2ant_pre_load_firmware(btcoexist); - } -} - void exhalbtc_init_hw_config(struct btc_coexist *btcoexist) { bool wifi_only = true; @@ -1214,19 +1160,6 @@ void exhalbtc_bt_info_notify(struct btc_coexist *btcoexist, halbtc_normal_low_power(btcoexist); } -void exhalbtc_rf_status_notify(struct btc_coexist *btcoexist, u8 type) -{ - if (!halbtc_is_bt_coexist_available(btcoexist)) - return; - - if (IS_HARDWARE_TYPE_8821(btcoexist->adapter)) { - } else if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) { - if (btcoexist->board_info.btdm_ant_num == 1) - ex_btc8723b1ant_rf_status_notify(btcoexist, type); - } else if (IS_HARDWARE_TYPE_8192E(btcoexist->adapter)) { - } -} - void exhalbtc_stack_operation_notify(struct btc_coexist *btcoexist, u8 type) { u8 stack_op_type; @@ -1362,13 +1295,6 @@ void exhalbtc_dbg_control(struct btc_coexist *btcoexist, halbtc_normal_low_power(btcoexist); } -void exhalbtc_antenna_detection(struct btc_coexist *btcoexist, u32 cent_freq, - u32 offset, u32 span, u32 seconds) -{ - if (!halbtc_is_bt_coexist_available(btcoexist)) - return; -} - void exhalbtc_stack_update_profile_info(void) { }