Linux wireless drivers development
 help / color / mirror / Atom feed
From: Larry Finger <Larry.Finger@lwfinger.net>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org,
	Larry Finger <Larry.Finger@lwfinger.net>,
	Yan-Hsuan Chuang <yhchuang@realtek.com>,
	Ping-Ke Shih <pkshih@realtek.com>,
	Birming Chiu <birming@realtek.com>, Shaofu <shaofu@realtek.com>,
	Steven Ting <steventing@realtek.com>
Subject: [PATCH 7/7] rtlwifi: btcoex: Fix another edit mistake in 21a 1ant
Date: Thu, 25 May 2017 12:48:14 -0500	[thread overview]
Message-ID: <20170525174814.25005-8-Larry.Finger@lwfinger.net> (raw)
In-Reply-To: <20170525174814.25005-1-Larry.Finger@lwfinger.net>

In routine btc8821a1ant_action_wifi_multi_port(), an edit that removed
several lines was missed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
 .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c    | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 30364966b938..6a1d0dece485 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -44,8 +44,6 @@ static struct coex_dm_8821a_1ant glcoex_dm_8821a_1ant;
 static struct coex_dm_8821a_1ant *coex_dm = &glcoex_dm_8821a_1ant;
 static struct coex_sta_8821a_1ant glcoex_sta_8821a_1ant;
 static struct coex_sta_8821a_1ant *coex_sta = &glcoex_sta_8821a_1ant;
-static void btc8821a1ant_act_bt_sco_hid_only_busy(struct btc_coexist *btcoexist,
-						  u8 wifi_status);
 
 static const char *const glbt_info_src_8821a_1ant[] = {
 	  "BT Info[wifi fw]",
@@ -1472,35 +1470,10 @@ static void btc8821a1ant_action_hid_a2dp(struct btc_coexist *btcoexist)
 static
 void btc8821a1ant_action_wifi_multi_port(struct btc_coexist *btcoexist)
 {
-	struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
-
 	btc8821a1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE, 0x0, 0x0);
-	/* tdma and coex table */
-	if (coex_dm->bt_status == BT_8821A_1ANT_BT_STATUS_ACL_BUSY) {
-		if (bt_link_info->a2dp_exist) {
-			btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14);
-			btc8821a1ant_coex_table_with_type(btcoexist,
-							  NORMAL_EXEC, 1);
-		} else if (bt_link_info->a2dp_exist &&
-			   bt_link_info->pan_exist) {
-			btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
-			btc8821a1ant_coex_table_with_type(btcoexist,
-							  NORMAL_EXEC, 4);
-		} else {
-			btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);
-			btc8821a1ant_coex_table_with_type(btcoexist,
-							  NORMAL_EXEC, 4);
-		}
-	} else if ((coex_dm->bt_status == BT_8821A_1ANT_BT_STATUS_SCO_BUSY) ||
-		   (BT_8821A_1ANT_BT_STATUS_ACL_SCO_BUSY ==
-		    coex_dm->bt_status)) {
-		btc8821a1ant_act_bt_sco_hid_only_busy(btcoexist,
-				BT_8821A_1ANT_WIFI_STATUS_CONNECTED_SCAN);
-	} else {
 		btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
 		btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2);
 	}
-}
 
 static
 void btc8821a1ant_action_wifi_not_connected_asso_auth(
-- 
2.12.0

      parent reply	other threads:[~2017-05-25 17:48 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-25 17:48 [PATCH 0/7] rtlwifi: btcoex: Final round of fixes Larry Finger
2017-05-25 17:48 ` [PATCH 1/7] rtlwifi: btcoex: update new btcoex version Larry Finger
2017-05-26  8:38   ` kbuild test robot
2017-05-26 10:05   ` kbuild test robot
2017-05-25 17:48 ` [PATCH 2/7] rtlwifi: btcoex: fix compiler warnings for unused functions Larry Finger
2017-05-25 17:48 ` [PATCH 3/7] rtlwifi: btcoex: bind bt to the adapter when initialization Larry Finger
2017-05-25 17:48 ` [PATCH 4/7] rtlwifi: btcoex: 92e: rename function that was missing to be consistent Larry Finger
2017-05-25 17:48 ` [PATCH 5/7] rtlwifi: btcoex: Fix Sparse messages for undeclared symbols Larry Finger
2017-05-25 17:48 ` [PATCH 6/7] rtlwifi: btcoex: Fix logic error in 21a 1ant Larry Finger
2017-05-25 17:48 ` Larry Finger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170525174814.25005-8-Larry.Finger@lwfinger.net \
    --to=larry.finger@lwfinger.net \
    --cc=birming@realtek.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=pkshih@realtek.com \
    --cc=shaofu@realtek.com \
    --cc=steventing@realtek.com \
    --cc=yhchuang@realtek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox