Rename variable ChlWidth to chl_width to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies <tdavies@xxxxxxxxxxxxxxx> --- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +++++----- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_wx.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 7e0f64df01ea..938be9c27e0b 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -25,7 +25,7 @@ enum ht_extchnl_offset { struct ht_capab_ele { u8 AdvCoding:1; - u8 ChlWidth:1; + u8 chl_width:1; u8 MimoPwrSave:2; u8 GreenField:1; u8 ShortGI20Mhz:1; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 503ea1e92a7d..b79ea0b42e44 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -253,9 +253,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, cap_ele->AdvCoding = 0; if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) - cap_ele->ChlWidth = 0; + cap_ele->chl_width = 0; else - cap_ele->ChlWidth = 1; + cap_ele->chl_width = 1; cap_ele->MimoPwrSave = 3; cap_ele->GreenField = 0; @@ -272,7 +272,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, netdev_dbg(ieee->dev, "TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n", - cap_ele->ChlWidth, cap_ele->MaxAMSDUSize, cap_ele->DssCCk); + cap_ele->chl_width, cap_ele->MaxAMSDUSize, cap_ele->DssCCk); if (is_encrypt) { cap_ele->MPDUDensity = 7; @@ -302,7 +302,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap, cap_ele->ShortGI40Mhz = 0; if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) { - cap_ele->ChlWidth = 0; + cap_ele->chl_width = 0; cap_ele->MCS[1] = 0; } } @@ -452,7 +452,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee) print_hex_dump_bytes("%s: ", __func__, DUMP_PREFIX_NONE, pPeerHTCap, sizeof(struct ht_capab_ele)); #endif - ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), + ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->chl_width), (enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset)); ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ? true : false); diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index ebf8a2fd36d3..ee469c9118b8 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1877,7 +1877,7 @@ static void rtllib_parse_mfie_ht_cap(struct rtllib_info_element *info_element, ht->bd_bandwidth = (enum ht_channel_width) (((struct ht_capab_ele *) - (ht->bd_ht_cap_buf))->ChlWidth); + (ht->bd_ht_cap_buf))->chl_width); } else { ht->bd_support_ht = false; ht->bd_ht_1r = false; diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c index 55a3e4222cd6..1cfd109881ad 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -129,8 +129,8 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, else ht_cap = (struct ht_capab_ele *) &network->bssht.bd_ht_cap_buf[0]; - is40M = (ht_cap->ChlWidth) ? 1 : 0; - isShortGI = (ht_cap->ChlWidth) ? + is40M = (ht_cap->chl_width) ? 1 : 0; + isShortGI = (ht_cap->chl_width) ? ((ht_cap->ShortGI40Mhz) ? 1 : 0) : ((ht_cap->ShortGI20Mhz) ? 1 : 0); -- 2.30.2