staging: rtl8192e: some coding style cleanups
cover staging: rtl8192e: some coding style cleanups
This series contains some simple coding style cleanups to clear some checkpatch warnings. Compile-tested only.
Michael Straube (3):
staging: rtl8192e: remove braces from single statement blocks
staging: rtl8192e: remove return from void function rtl92e_set_channel
staging: rtl8192e: initialize variables at declaration
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 ++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_rx.c | 5 ++--- 5 files changed, 7 insertions(+), 11 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/3 staging: rtl8192e: remove braces from single statement blocks
Remove braces from single statement blocks to clear some checkpatch warnings.
WARNING: braces {} are not necessary for single statement blocks
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +2 -3
@@ -693,11 +693,10 @@ void rtl92e_link_change(struct net_device *dev)u32 reg; reg =rtl92e_readl (dev,RCR ); -if (priv->rtllib->link_state ==MAC80211_LINKED ) { +if (priv->rtllib->link_state ==MAC80211_LINKED ) priv->receive_config = reg |=RCR_CBSSID ; - }else { +else priv->receive_config = reg &= ~RCR_CBSSID ; - }rtl92e_writel (dev,RCR , reg); }
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -2
@@ -964,9 +964,8 @@ static void _rtl92e_watchdog_wq_cb(void *data) MAC80211_NOLINK) && (ieee->rf_power_state == rf_on) && !ieee->is_set_key && (!ieee->proto_stoppping) && !ieee->wx_set_enc) { -if (ieee->pwr_save_ctrl.ReturnPoint ==IPS_CALLBACK_NONE ) { +if (ieee->pwr_save_ctrl.ReturnPoint ==IPS_CALLBACK_NONE )rtl92e_ips_enter (dev); - } } }if ((ieee->link_state ==MAC80211_LINKED ) && (ieee->iw_mode ==IW_MODE_INFRA )) {
drivers/staging/rtl8192e/rtl819x_HTProc.c +2 -2
@@ -480,9 +480,9 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee) } ht_info->current_mpdu_density = pPeerHTCap->MPDUDensity; -if (ht_info->iot_action &HT_IOT_ACT_TX_USE_AMSDU_8K ) { +if (ht_info->iot_action &HT_IOT_ACT_TX_USE_AMSDU_8K ) ht_info->current_ampdu_enable = false; - } + ht_info->cur_rx_reorder_enable =1 ;if (pPeerHTCap->MCS[0 ] ==0 )
Signature · 1 line
2.43.0
PATCH 2/3 staging: rtl8192e: remove return from void function rtl92e_set_channel
In reply to Michael StraubeRemove return from the void function rtl92e_set_channel. Found by checkpatch.
WARNING: void function return statements are not generally useful
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +0 -1
@@ -714,7 +714,6 @@ void rtl92e_set_channel(struct net_device *dev, u8 channel)if (priv->up)_rtl92e_phy_switch_channel_work_item (dev); priv->sw_chnl_in_progress = false; -return ; }static void _rtl92e_cck_tx_power_track_bw_switch_tssi (struct net_device *dev)
Signature · 1 line
2.43.0
PATCH 3/3 staging: rtl8192e: initialize variables at declaration
In reply to Michael StraubeInitialize two variables at declaration instead of first declare and then initialize them. This saves a line of code and clears a checkpatch warning.
WARNING: Missing a blank line after declarations
--- drivers/staging/rtl8192e/rtllib_rx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtllib_rx.c +2 -3
@@ -943,10 +943,9 @@ static void rtllib_rx_extract_addr(struct rtllib_device *ieee,static int rtllib_rx_data_filter (struct rtllib_device *ieee,struct ieee80211_hdr *hdr,u8 *dst,u8 *src,u8 *bssid,u8 *addr2) { -u8 type, stype;u16 fc =le16_to_cpu (hdr->frame_control); - type =WLAN_FC_GET_TYPE (fc); - stype =WLAN_FC_GET_STYPE (fc); +u8 type =WLAN_FC_GET_TYPE (fc); +u8 stype =WLAN_FC_GET_STYPE (fc);/* Filter frames from different BSS */ if (ieee80211_has_a4(hdr->frame_control) &&
Signature · 1 line
2.43.0
Quoted 8 lines · Michael Straube
This series contains some simple coding style cleanups to clear some checkpatch warnings. Compile-tested only.
Michael Straube (3):
staging: rtl8192e: remove braces from single statement blocks
staging: rtl8192e: remove return from void functionrtl92e_set_channel
staging: rtl8192e: initialize variables at declaration
Quoted 7 lines
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 ++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_rx.c | 5 ++--- 5 files changed, 7 insertions(+), 11 deletions(-)