Skip to content

Commit 5cd73e7

Browse files
Philipp Hortmanngregkh
Philipp Hortmann
authored and
gregkh
committed
staging: rtl8192e: Rename DM_RxPathSelTable
Rename variable DM_RxPathSelTable to dm_rx_path_sel_table to avoid CamelCase which is not accepted by checkpatch. Remove "extern struct drx_path_sel DM_RxPathSelTable;" in rtl_dm.h as it is dead code. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/8846ad13a4ee4b534d2410c9bca0c2943500c858.1675792435.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 44414e6 commit 5cd73e7

2 files changed

Lines changed: 30 additions & 31 deletions

File tree

‎drivers/staging/rtl8192e/rtl8192e/rtl_dm.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ const u8 dm_cck_tx_bb_gain_ch14[CCK_TX_BB_GAIN_TABLE_LEN][8] = {
144144
/*------------------------Define global variable-----------------------------*/
145145
struct dig_t dm_digtable;
146146

147-
struct drx_path_sel DM_RxPathSelTable;
147+
struct drx_path_sel dm_rx_path_sel_table;
148148
/*------------------------Define global variable-----------------------------*/
149149

150150

@@ -1720,7 +1720,7 @@ void rtl92e_dm_rf_pathcheck_wq(void *data)
17201720
else
17211721
priv->brfpath_rxenable[i] = false;
17221722
}
1723-
if (!DM_RxPathSelTable.enable)
1723+
if (!dm_rx_path_sel_table.enable)
17241724
return;
17251725

17261726
_rtl92e_dm_rx_path_sel_byrssi(dev);
@@ -1731,18 +1731,18 @@ static void _rtl92e_dm_init_rx_path_selection(struct net_device *dev)
17311731
u8 i;
17321732
struct r8192_priv *priv = rtllib_priv(dev);
17331733

1734-
DM_RxPathSelTable.enable = 1;
1735-
DM_RxPathSelTable.ss_th_low = RX_PATH_SEL_SS_TH_LOW;
1736-
DM_RxPathSelTable.diff_th = RX_PATH_SEL_DIFF_TH;
1734+
dm_rx_path_sel_table.enable = 1;
1735+
dm_rx_path_sel_table.ss_th_low = RX_PATH_SEL_SS_TH_LOW;
1736+
dm_rx_path_sel_table.diff_th = RX_PATH_SEL_DIFF_TH;
17371737
if (priv->customer_id == RT_CID_819X_NETCORE)
1738-
DM_RxPathSelTable.cck_method = CCK_Rx_Version_2;
1738+
dm_rx_path_sel_table.cck_method = CCK_Rx_Version_2;
17391739
else
1740-
DM_RxPathSelTable.cck_method = CCK_Rx_Version_1;
1741-
DM_RxPathSelTable.disabled_rf = 0;
1740+
dm_rx_path_sel_table.cck_method = CCK_Rx_Version_1;
1741+
dm_rx_path_sel_table.disabled_rf = 0;
17421742
for (i = 0; i < 4; i++) {
1743-
DM_RxPathSelTable.rf_rssi[i] = 50;
1744-
DM_RxPathSelTable.cck_pwdb_sta[i] = -64;
1745-
DM_RxPathSelTable.rf_enable_rssi_th[i] = 100;
1743+
dm_rx_path_sel_table.rf_rssi[i] = 50;
1744+
dm_rx_path_sel_table.cck_pwdb_sta[i] = -64;
1745+
dm_rx_path_sel_table.rf_enable_rssi_th[i] = 100;
17461746
}
17471747
}
17481748

@@ -1769,22 +1769,22 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
17691769
return;
17701770

17711771
if (!cck_Rx_Path_initialized) {
1772-
DM_RxPathSelTable.cck_rx_path = (rtl92e_readb(dev, 0xa07)&0xf);
1772+
dm_rx_path_sel_table.cck_rx_path = (rtl92e_readb(dev, 0xa07)&0xf);
17731773
cck_Rx_Path_initialized = 1;
17741774
}
17751775

1776-
DM_RxPathSelTable.disabled_rf = 0xf;
1777-
DM_RxPathSelTable.disabled_rf &= ~(rtl92e_readb(dev, 0xc04));
1776+
dm_rx_path_sel_table.disabled_rf = 0xf;
1777+
dm_rx_path_sel_table.disabled_rf &= ~(rtl92e_readb(dev, 0xc04));
17781778

17791779
if (priv->rtllib->mode == WIRELESS_MODE_B)
1780-
DM_RxPathSelTable.cck_method = CCK_Rx_Version_2;
1780+
dm_rx_path_sel_table.cck_method = CCK_Rx_Version_2;
17811781

17821782
for (i = 0; i < RF90_PATH_MAX; i++) {
1783-
DM_RxPathSelTable.rf_rssi[i] = priv->stats.rx_rssi_percentage[i];
1783+
dm_rx_path_sel_table.rf_rssi[i] = priv->stats.rx_rssi_percentage[i];
17841784

17851785
if (priv->brfpath_rxenable[i]) {
17861786
rf_num++;
1787-
cur_rf_rssi = DM_RxPathSelTable.rf_rssi[i];
1787+
cur_rf_rssi = dm_rx_path_sel_table.rf_rssi[i];
17881788

17891789
if (rf_num == 1) {
17901790
max_rssi_index = min_rssi_index = sec_rssi_index = i;
@@ -1832,12 +1832,12 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
18321832
}
18331833

18341834
rf_num = 0;
1835-
if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_2) {
1835+
if (dm_rx_path_sel_table.cck_method == CCK_Rx_Version_2) {
18361836
for (i = 0; i < RF90_PATH_MAX; i++) {
18371837
if (priv->brfpath_rxenable[i]) {
18381838
rf_num++;
18391839
cur_cck_pwdb =
1840-
DM_RxPathSelTable.cck_pwdb_sta[i];
1840+
dm_rx_path_sel_table.cck_pwdb_sta[i];
18411841

18421842
if (rf_num == 1) {
18431843
cck_rx_ver2_max_index = i;
@@ -1894,25 +1894,25 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
18941894
}
18951895

18961896
update_cck_rx_path = 0;
1897-
if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_2) {
1897+
if (dm_rx_path_sel_table.cck_method == CCK_Rx_Version_2) {
18981898
cck_default_Rx = cck_rx_ver2_max_index;
18991899
cck_optional_Rx = cck_rx_ver2_sec_index;
19001900
if (tmp_cck_max_pwdb != -64)
19011901
update_cck_rx_path = 1;
19021902
}
19031903

1904-
if (tmp_min_rssi < DM_RxPathSelTable.ss_th_low && disabled_rf_cnt < 2) {
1904+
if (tmp_min_rssi < dm_rx_path_sel_table.ss_th_low && disabled_rf_cnt < 2) {
19051905
if ((tmp_max_rssi - tmp_min_rssi) >=
1906-
DM_RxPathSelTable.diff_th) {
1907-
DM_RxPathSelTable.rf_enable_rssi_th[min_rssi_index] =
1906+
dm_rx_path_sel_table.diff_th) {
1907+
dm_rx_path_sel_table.rf_enable_rssi_th[min_rssi_index] =
19081908
tmp_max_rssi+5;
19091909
rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable,
19101910
0x1<<min_rssi_index, 0x0);
19111911
rtl92e_set_bb_reg(dev, rOFDM1_TRxPathEnable,
19121912
0x1<<min_rssi_index, 0x0);
19131913
disabled_rf_cnt++;
19141914
}
1915-
if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_1) {
1915+
if (dm_rx_path_sel_table.cck_method == CCK_Rx_Version_1) {
19161916
cck_default_Rx = max_rssi_index;
19171917
cck_optional_Rx = sec_rssi_index;
19181918
if (tmp_max_rssi)
@@ -1921,24 +1921,24 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
19211921
}
19221922

19231923
if (update_cck_rx_path) {
1924-
DM_RxPathSelTable.cck_rx_path = (cck_default_Rx<<2) |
1924+
dm_rx_path_sel_table.cck_rx_path = (cck_default_Rx<<2) |
19251925
(cck_optional_Rx);
19261926
rtl92e_set_bb_reg(dev, rCCK0_AFESetting, 0x0f000000,
1927-
DM_RxPathSelTable.cck_rx_path);
1927+
dm_rx_path_sel_table.cck_rx_path);
19281928
}
19291929

1930-
if (DM_RxPathSelTable.disabled_rf) {
1930+
if (dm_rx_path_sel_table.disabled_rf) {
19311931
for (i = 0; i < 4; i++) {
1932-
if ((DM_RxPathSelTable.disabled_rf >> i) & 0x1) {
1932+
if ((dm_rx_path_sel_table.disabled_rf >> i) & 0x1) {
19331933
if (tmp_max_rssi >=
1934-
DM_RxPathSelTable.rf_enable_rssi_th[i]) {
1934+
dm_rx_path_sel_table.rf_enable_rssi_th[i]) {
19351935
rtl92e_set_bb_reg(dev,
19361936
rOFDM0_TRxPathEnable,
19371937
0x1 << i, 0x1);
19381938
rtl92e_set_bb_reg(dev,
19391939
rOFDM1_TRxPathEnable,
19401940
0x1 << i, 0x1);
1941-
DM_RxPathSelTable.rf_enable_rssi_th[i]
1941+
dm_rx_path_sel_table.rf_enable_rssi_th[i]
19421942
= 100;
19431943
disabled_rf_cnt--;
19441944
}

‎drivers/staging/rtl8192e/rtl8192e/rtl_dm.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ struct dcmd_txcmd {
155155

156156
/*------------------------Export global variable----------------------------*/
157157
extern struct dig_t dm_digtable;
158-
extern struct drx_path_sel DM_RxPathSelTable;
159158

160159
/* Pre-calculated gain tables */
161160
extern const u32 dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN];

0 commit comments

Comments
 (0)