Coding style issue, checkpatch Avoid CamelCase, rename it. bCurShortGI20MHz -> cur_short_gi_20mhz Signed-off-by: Gary Rookard <garyrookard@xxxxxxxxxxxx> --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++--- drivers/staging/rtl8192e/rtllib_tx.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index f01240f7e514..e6d51abd0d01 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1766,7 +1766,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) ieee->ht_info->cur_short_gi_40mhz) ratr_value |= 0x80000000; else if (!ieee->ht_info->cur_tx_bw40mhz && - ieee->ht_info->bCurShortGI20MHz) + ieee->ht_info->cur_short_gi_20mhz) ratr_value |= 0x80000000; rtl92e_writel(dev, RATR0 + rate_index * 4, ratr_value); rtl92e_writeb(dev, UFWP, 1); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index c73d2ac910d5..e2828d57d1fd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -289,7 +289,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) bshort_gi_enabled = (ht_info->cur_tx_bw40mhz && ht_info->cur_short_gi_40mhz) || (!ht_info->cur_tx_bw40mhz && - ht_info->bCurShortGI20MHz); + ht_info->cur_short_gi_20mhz); pra->upper_rssi_threshold_ratr = (pra->upper_rssi_threshold_ratr & (~BIT(31))) | diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index f89b618f71a5..77f28d87d3c0 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -99,7 +99,7 @@ struct rt_hi_throughput { u8 reg_short_gi_40mhz; u8 cur_short_gi_40mhz; u8 reg_short_gi_20mhz; - u8 bCurShortGI20MHz; + u8 cur_short_gi_20mhz; u8 reg_supp_cck; u8 bCurSuppCCK; enum ht_spec_ver ePeerHTSpecVer; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index f9c76aaf8791..633f735bdab1 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -110,7 +110,7 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate) u8 is40MHz = (ht_info->cur_bw_40mhz) ? 1 : 0; u8 isShortGI = (ht_info->cur_bw_40mhz) ? ((ht_info->cur_short_gi_40mhz) ? 1 : 0) : - ((ht_info->bCurShortGI20MHz) ? 1 : 0); + ((ht_info->cur_short_gi_20mhz) ? 1 : 0); return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)]; } @@ -478,7 +478,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ? true : false); - ht_info->bCurShortGI20MHz = ((ht_info->reg_short_gi_20mhz) ? + ht_info->cur_short_gi_20mhz = ((ht_info->reg_short_gi_20mhz) ? ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false) : false); ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ? @@ -562,7 +562,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_bw_40mhz = false; ht_info->cur_tx_bw40mhz = false; - ht_info->bCurShortGI20MHz = false; + ht_info->cur_short_gi_20mhz = false; ht_info->cur_short_gi_40mhz = false; ht_info->forced_short_gi = false; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index 041520e6c28d..ed264fc75457 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -364,7 +364,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz) tcb_desc->bUseShortGI = true; - else if (!ht_info->cur_bw_40mhz && ht_info->bCurShortGI20MHz) + else if (!ht_info->cur_bw_40mhz && ht_info->cur_short_gi_20mhz) tcb_desc->bUseShortGI = true; } -- 2.41.0