Skip to content

Commit fc856b8

Browse files
gregkhgregkh
committed
Staging: rtl8821ae: removed unused functions and variables
Clean up a bunch of build warnings by removing functions and variables that aren't being used. Cc: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 530877d commit fc856b8

File tree

4 files changed

+3
-354
lines changed

4 files changed

+3
-354
lines changed

‎drivers/staging/rtl8821ae/rtl8821ae/dm.c

Lines changed: 1 addition & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,6 @@ void rtl8821ae_dm_initialize_txpower_tracking_thermalmeter(
556556
}
557557
}
558558

559-
static void rtl8821ae_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
560-
{
561-
rtl8821ae_dm_initialize_txpower_tracking_thermalmeter(hw);
562-
}
563-
564559
static void rtl8821ae_dm_init_dynamic_bb_powersaving(struct ieee80211_hw *hw)
565560
{
566561
dm_pstable.pre_ccastate = CCA_MAX;
@@ -775,7 +770,6 @@ void rtl8812ae_dm_rssi_dump_to_register(
775770
static void rtl8821ae_dm_check_rssi_monitor(struct ieee80211_hw *hw)
776771
{
777772
struct rtl_priv *rtlpriv = rtl_priv(hw);
778-
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
779773
struct rtl_sta_info *drv_priv;
780774
u8 h2c_parameter[3] = { 0 };
781775
long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff;
@@ -1131,12 +1125,6 @@ void rtl8812ae_dm_check_txpower_tracking_thermalmeter(
11311125
}
11321126
}
11331127

1134-
static void rtl8821ae_dm_dynamic_txpower(struct ieee80211_hw *hw)
1135-
{
1136-
/* 8723BE does not support ODM_BB_DYNAMIC_TXPWR*/
1137-
return;
1138-
}
1139-
11401128
static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw)
11411129
{
11421130
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -1166,107 +1154,6 @@ static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw)
11661154
}
11671155

11681156

1169-
static void rtl8821ae_set_iqk_matrix(struct ieee80211_hw *hw,
1170-
u8 ofdm_index,
1171-
u8 rfpath,
1172-
long iqk_result_x,
1173-
long iqk_result_y)
1174-
{
1175-
long ele_a = 0, ele_d, ele_c = 0, value32;
1176-
1177-
if (ofdm_index >= OFDM_TABLE_SIZE)
1178-
ofdm_index = OFDM_TABLE_SIZE - 1;
1179-
else if (ofdm_index < 0)
1180-
ofdm_index = 0;
1181-
1182-
ele_d = (ofdmswing_table[ofdm_index] & 0xFFC00000)>>22;
1183-
1184-
if (iqk_result_x != 0){
1185-
if ((iqk_result_x & 0x00000200) != 0)
1186-
iqk_result_x = iqk_result_x | 0xFFFFFC00;
1187-
ele_a = ((iqk_result_x * ele_d)>>8)&0x000003FF;
1188-
1189-
if ((iqk_result_y & 0x00000200) != 0)
1190-
iqk_result_y = iqk_result_y | 0xFFFFFC00;
1191-
ele_c = ((iqk_result_y * ele_d)>>8)&0x000003FF;
1192-
1193-
switch (rfpath){
1194-
case RF90_PATH_A:
1195-
value32 = (ele_d << 22)|((ele_c & 0x3F)<<16) | ele_a;
1196-
rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD, value32);
1197-
value32 = (ele_c & 0x000003C0) >> 6;
1198-
rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, value32);
1199-
value32 = ((iqk_result_x * ele_d) >> 7) & 0x01;
1200-
rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24), value32);
1201-
break;
1202-
default:
1203-
break;
1204-
}
1205-
} else {
1206-
switch (rfpath){
1207-
case RF90_PATH_A:
1208-
rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD, ofdmswing_table[ofdm_index]);
1209-
rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, 0x00);
1210-
rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24), 0x00);
1211-
break;
1212-
default:
1213-
break;
1214-
}
1215-
}
1216-
}
1217-
1218-
1219-
static void rtl8821ae_dm_tx_power_track_set_power(struct ieee80211_hw *hw,
1220-
enum pwr_track_control_method method,
1221-
u8 rfpath,
1222-
u8 channel_mapped_index)
1223-
{
1224-
struct rtl_priv *rtlpriv = rtl_priv(hw);
1225-
struct rtl_phy *rtlphy = &(rtlpriv->phy);
1226-
struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
1227-
1228-
if (method == TXAGC) {
1229-
rtl8821ae_phy_set_txpower_level(hw,rtlphy->current_channel);
1230-
} else if (method == BBSWING) {
1231-
if (rtldm->bb_swing_idx_cck >= CCK_TABLE_SIZE)
1232-
rtldm->bb_swing_idx_cck = CCK_TABLE_SIZE-1;
1233-
else if (rtldm->bb_swing_idx_cck < 0)
1234-
rtldm->bb_swing_idx_cck = 0;
1235-
1236-
if (!rtldm->b_cck_inch14) {
1237-
rtl_write_byte(rtlpriv, 0xa22, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][0]);
1238-
rtl_write_byte(rtlpriv, 0xa23, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][1]);
1239-
rtl_write_byte(rtlpriv, 0xa24, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][2]);
1240-
rtl_write_byte(rtlpriv, 0xa25, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][3]);
1241-
rtl_write_byte(rtlpriv, 0xa26, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][4]);
1242-
rtl_write_byte(rtlpriv, 0xa27, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][5]);
1243-
rtl_write_byte(rtlpriv, 0xa28, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][6]);
1244-
rtl_write_byte(rtlpriv, 0xa29, cckswing_table_ch1ch13[rtldm->bb_swing_idx_cck][7]);
1245-
} else{
1246-
rtl_write_byte(rtlpriv, 0xa22, cckswing_table_ch14[rtldm->bb_swing_idx_cck][0]);
1247-
rtl_write_byte(rtlpriv, 0xa23, cckswing_table_ch14[rtldm->bb_swing_idx_cck][1]);
1248-
rtl_write_byte(rtlpriv, 0xa24, cckswing_table_ch14[rtldm->bb_swing_idx_cck][2]);
1249-
rtl_write_byte(rtlpriv, 0xa25, cckswing_table_ch14[rtldm->bb_swing_idx_cck][3]);
1250-
rtl_write_byte(rtlpriv, 0xa26, cckswing_table_ch14[rtldm->bb_swing_idx_cck][4]);
1251-
rtl_write_byte(rtlpriv, 0xa27, cckswing_table_ch14[rtldm->bb_swing_idx_cck][5]);
1252-
rtl_write_byte(rtlpriv, 0xa28, cckswing_table_ch14[rtldm->bb_swing_idx_cck][6]);
1253-
rtl_write_byte(rtlpriv, 0xa29, cckswing_table_ch14[rtldm->bb_swing_idx_cck][7]);
1254-
}
1255-
1256-
if (rfpath == RF90_PATH_A){
1257-
rtl8821ae_set_iqk_matrix(hw, rtldm->bb_swing_idx_ofdm[rfpath], rfpath,
1258-
rtlphy->iqk_matrix_regsetting[channel_mapped_index].value[0][0],
1259-
rtlphy->iqk_matrix_regsetting[channel_mapped_index].value[0][1]);
1260-
} else if (rfpath == RF90_PATH_B) {
1261-
rtl8821ae_set_iqk_matrix(hw, rtldm->bb_swing_idx_ofdm[rfpath], rfpath,
1262-
rtlphy->iqk_matrix_regsetting[channel_mapped_index].value[0][4],
1263-
rtlphy->iqk_matrix_regsetting[channel_mapped_index].value[0][5]);
1264-
}
1265-
} else {
1266-
return;
1267-
}
1268-
}
1269-
12701157
void rtl8812ae_get_delta_swing_table(
12711158
struct ieee80211_hw *hw,
12721159
u8 **temperature_up_a,
@@ -1323,8 +1210,6 @@ void rtl8812ae_phy_lccalibrate(
13231210
struct ieee80211_hw *hw)
13241211
{
13251212
struct rtl_priv *rtlpriv = rtl_priv(hw);
1326-
bool b_start_cont_tx = false, b_single_tone = false, b_carrier_suppression = false;
1327-
13281213

13291214
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD, ("===> rtl8812ae_phy_lccalibrate\n"));
13301215

@@ -1455,8 +1340,6 @@ void rtl8812ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
14551340
u8 pwr_tracking_limit = 26; /*+1.0dB*/
14561341
u8 tx_rate = 0xFF;
14571342
char final_ofdm_swing_index = 0;
1458-
char final_cck_swing_index = 0;
1459-
u8 i = 0;
14601343

14611344
if(rtldm->tx_rate != 0xFF)
14621345
tx_rate = rtl8812ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
@@ -2083,8 +1966,6 @@ void rtl8821ae_phy_lccalibrate(
20831966
struct ieee80211_hw *hw)
20841967
{
20851968
struct rtl_priv *rtlpriv = rtl_priv(hw);
2086-
bool b_start_cont_tx = false, b_single_tone = false, b_carrier_suppression = false;
2087-
20881969

20891970
RT_TRACE(COMP_POWER_TRACKING, DBG_LOUD, ("===> rtl8812ae_phy_lccalibrate\n"));
20901971

@@ -2119,8 +2000,6 @@ void rtl8821ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
21192000
u8 pwr_tracking_limit = 26; /*+1.0dB*/
21202001
u8 tx_rate = 0xFF;
21212002
char final_ofdm_swing_index = 0;
2122-
char final_cck_swing_index = 0;
2123-
u8 i = 0;
21242003

21252004
if(rtldm->tx_rate != 0xFF)
21262005
tx_rate = rtl8812ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
@@ -2806,7 +2685,7 @@ static void rtl8821ae_dm_check_edca_turbo(struct ieee80211_hw *hw)
28062685
rtlpriv->dm.bcurrent_turbo_edca = false;
28072686
}
28082687

2809-
dm_CheckEdcaTurbo_EXIT:
2688+
/* dm_CheckEdcaTurbo_EXIT: */
28102689
rtlpriv->dm.bis_any_nonbepkts = false;
28112690
rtldm->last_tx_ok_cnt = rtlpriv->stats.txbytesunicast;
28122691
rtldm->last_rx_ok_cnt = rtlpriv->stats.rxbytesunicast;

‎drivers/staging/rtl8821ae/rtl8821ae/fw.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,13 +1289,8 @@ void rtl8812ae_c2h_ra_report_handler(
12891289
u8 cmd_len
12901290
)
12911291
{
1292-
struct rtl_priv *rtlpriv = rtl_priv(hw);
12931292
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
1294-
12951293
u8 rate = cmd_buf[0] & 0x3F;
1296-
u8 mac_id = cmd_buf[1];
1297-
bool b_ldpc = cmd_buf[2] & BIT(0);
1298-
bool b_tx_bf = (cmd_buf[2] & BIT(1)) >> 1;
12991294

13001295
rtlhal->current_ra_rate= rtl8812ae_hw_rate_to_mrate(hw, rate);
13011296

0 commit comments

Comments
 (0)