rtl8821ae: fixed defined-not-used warning (b9fb4330) · Commits · 戴 / test

drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.c

+0 −43

Original line number	Diff line number	Diff line
		@@ -503,38 +503,6 @@ static void halbtc8192e2ant_querybt_info(struct btc_coexist *btcoexist)
		btcoexist->btc_fill_h2c(btcoexist, 0x61, 1, h2c_parameter);
		}

		static bool halbtc8192e2ant_iswifi_status_changed(struct btc_coexist *btcoexist)
		{
		static bool pre_wifi_busy;
		static bool pre_under_4way, pre_bt_hson;
		bool wifi_busy = false, under_4way = false, bt_hson = false;
		bool wifi_connected = false;

		btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,
		&wifi_connected);
		btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy);
		btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_OPERATION, &bt_hson);
		btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_4_WAY_PROGRESS,
		&under_4way);

		if (wifi_connected) {
		if (wifi_busy != pre_wifi_busy) {
		pre_wifi_busy = wifi_busy;
		return true;
		}
		if (under_4way != pre_under_4way) {
		pre_under_4way = under_4way;
		return true;
		}
		if (bt_hson != pre_bt_hson) {
		pre_bt_hson = bt_hson;
		return true;
		}
		}

		return false;
		}

		static void halbtc8192e2ant_update_btlink_info(struct btc_coexist *btcoexist)
		{
		struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
		@@ -3833,9 +3801,6 @@ void ex_halbtc8192e2ant_display_coex_info(struct btc_coexist *btcoexist)
		"0x774(lp rx[31:16]/tx[15:0])",
		coex_sta->low_priority_rx, coex_sta->low_priority_tx);
		CL_PRINTF(cli_buf);
		#if (BT_AUTO_REPORT_ONLY_8192E_2ANT == 1)
		halbtc8192e2ant_monitor_bt_ctr(btcoexist);
		#endif
		btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_COEX_STATISTICS);
		}

		@@ -4011,14 +3976,12 @@ void ex_halbtc8192e2ant_bt_info_notify(struct btc_coexist *btcoexist,
		* do nothing here. */
		}

		#if (BT_AUTO_REPORT_ONLY_8192E_2ANT == 0)
		if ((coex_sta->bt_info_ext & BIT4)) {
		/* BT auto report already enabled, do nothing */
		} else {
		halbtc8192e2ant_bt_autoreport(btcoexist, FORCE_EXEC,
		true);
		}
		#endif
		}

		/* check BIT2 first ==> check if bt is under inquiry or page scan */
		@@ -4148,14 +4111,8 @@ void ex_halbtc8192e2ant_periodical(struct btc_coexist *btcoexist)
		"************************************************\n");
		}

		#if (BT_AUTO_REPORT_ONLY_8192E_2ANT == 0)
		halbtc8192e2ant_querybt_info(btcoexist);
		halbtc8192e2ant_monitor_bt_ctr(btcoexist);
		halbtc8192e2ant_monitor_bt_enable_disable(btcoexist);
		#else
		if (halbtc8192e2ant_iswifi_status_changed(btcoexist) \|\|
		coex_dm->auto_tdma_adjust)
		halbtc8192e2ant_run_coexist_mechanism(btcoexist);
		#endif
		}

drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.h

+0 −2

Original line number	Diff line number	Diff line
		/*****************************************************************
		* The following is for 8192E 2Ant BT Co-exist definition
		*****************************************************************/
		#define BT_AUTO_REPORT_ONLY_8192E_2ANT 0

		#define BT_INFO_8192E_2ANT_B_FTP BIT7
		#define BT_INFO_8192E_2ANT_B_A2DP BIT6
		#define BT_INFO_8192E_2ANT_B_HID BIT5

Admin message