Skip to content

Commit 2bc2c36

Browse files
losgobbigregkh
authored andcommitted
staging: rtl8723bs: delete DBG_RX_SIGNAL_DISPLAY_RAW_DATA ifdef code
remove code depending on cflag since it's not compiling and there is no reference for it's usage; Signed-off-by: Rodrigo Gobbi <[email protected]> Reviewed-by: Dan Carpenter <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a99e5c8 commit 2bc2c36

File tree

4 files changed

+0
-80
lines changed

4 files changed

+0
-80
lines changed

drivers/staging/rtl8723bs/hal/hal_com.c

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -683,12 +683,6 @@ u8 SetHalDefVar(
683683

684684
switch (variable) {
685685
case HAL_DEF_DBG_RX_INFO_DUMP:
686-
687-
if (odm->bLinked) {
688-
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
689-
rtw_dump_raw_rssi_info(adapter);
690-
#endif
691-
}
692686
break;
693687
case HW_DEF_ODM_DBG_FLAG:
694688
ODM_CmnInfoUpdate(odm, ODM_CMNINFO_DBG_COMP, *((u64 *)value));
@@ -879,53 +873,6 @@ void rtw_hal_check_rxfifo_full(struct adapter *adapter)
879873
}
880874
}
881875

882-
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
883-
void rtw_dump_raw_rssi_info(struct adapter *padapter)
884-
{
885-
u8 isCCKrate, rf_path;
886-
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
887-
struct rx_raw_rssi *psample_pkt_rssi = &padapter->recvpriv.raw_rssi_info;
888-
889-
isCCKrate = psample_pkt_rssi->data_rate <= DESC_RATE11M;
890-
891-
if (isCCKrate)
892-
psample_pkt_rssi->mimo_signal_strength[0] = psample_pkt_rssi->pwdball;
893-
894-
for (rf_path = 0; rf_path < pHalData->NumTotalRFPath; rf_path++) {
895-
if (!isCCKrate) {
896-
netdev_dbg(padapter->pnetdev, ", rx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n",
897-
psample_pkt_rssi->ofdm_pwr[rf_path],
898-
psample_pkt_rssi->ofdm_snr[rf_path]);
899-
}
900-
}
901-
}
902-
903-
void rtw_store_phy_info(struct adapter *padapter, union recv_frame *prframe)
904-
{
905-
u8 isCCKrate, rf_path;
906-
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
907-
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
908-
909-
struct odm_phy_info *pPhyInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info);
910-
struct rx_raw_rssi *psample_pkt_rssi = &padapter->recvpriv.raw_rssi_info;
911-
912-
psample_pkt_rssi->data_rate = pattrib->data_rate;
913-
isCCKrate = pattrib->data_rate <= DESC_RATE11M;
914-
915-
psample_pkt_rssi->pwdball = pPhyInfo->rx_pwd_ba11;
916-
psample_pkt_rssi->pwr_all = pPhyInfo->recv_signal_power;
917-
918-
for (rf_path = 0; rf_path < pHalData->NumTotalRFPath; rf_path++) {
919-
psample_pkt_rssi->mimo_signal_strength[rf_path] = pPhyInfo->rx_mimo_signal_strength[rf_path];
920-
psample_pkt_rssi->mimo_signal_quality[rf_path] = pPhyInfo->rx_mimo_signal_quality[rf_path];
921-
if (!isCCKrate) {
922-
psample_pkt_rssi->ofdm_pwr[rf_path] = pPhyInfo->RxPwr[rf_path];
923-
psample_pkt_rssi->ofdm_snr[rf_path] = pPhyInfo->RxSNR[rf_path];
924-
}
925-
}
926-
}
927-
#endif
928-
929876
static u32 Array_kfreemap[] = {
930877
0xf8, 0xe,
931878
0xf6, 0xc,

drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,4 @@ void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe)
6767
/* Check EVM */
6868
/* */
6969
process_link_qual(padapter, precvframe);
70-
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
71-
rtw_store_phy_info(padapter, prframe);
72-
#endif
73-
7470
}

drivers/staging/rtl8723bs/include/hal_com.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,6 @@ bool eqNByte(u8 *str1, u8 *str2, u32 num);
149149

150150
bool GetU1ByteIntegerFromStringInDecimal(char *str, u8 *in);
151151

152-
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
153-
void rtw_store_phy_info(struct adapter *padapter, union recv_frame *prframe);
154-
void rtw_dump_raw_rssi_info(struct adapter *padapter);
155-
#endif
156-
157152
#define HWSET_MAX_SIZE 512
158153

159154
void rtw_bb_rf_gain_offset(struct adapter *padapter);

drivers/staging/rtl8723bs/include/rtw_recv.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,6 @@ struct phy_info {
8989
u8 btCoexPwrAdjust;
9090
};
9191

92-
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
93-
struct rx_raw_rssi {
94-
u8 data_rate;
95-
u8 pwdball;
96-
s8 pwr_all;
97-
98-
u8 mimo_signal_strength[4];/* in 0~100 index */
99-
u8 mimo_signal_quality[4];
100-
101-
s8 ofdm_pwr[4];
102-
u8 ofdm_snr[4];
103-
104-
};
105-
#endif
106-
10792
struct rx_pkt_attrib {
10893
u16 pkt_len;
10994
u8 physt;
@@ -221,9 +206,6 @@ struct recv_priv {
221206
u8 signal_strength;
222207
u8 signal_qual;
223208
s8 rssi; /* translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength); */
224-
#ifdef DBG_RX_SIGNAL_DISPLAY_RAW_DATA
225-
struct rx_raw_rssi raw_rssi_info;
226-
#endif
227209
/* s8 rxpwdb; */
228210
s16 noise;
229211
/* int RxSNRdB[2]; */

0 commit comments

Comments
 (0)