staging: rtl8723bs: fix line length checks in rtw_cmd.c
PATCH 1/1 staging: rtl8723bs: fix line length checks in rtw_cmd.c
Fix both block comments and assignment statements that exceed the 100-column limit to follow Linux guidelines for readability.
Signed-off-by Noah Techoueyres <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +17 -6
@@ -1117,13 +1117,17 @@ static void collect_traffic_statistics(struct adapter *padapter) pdvobjpriv->traffic_stat.rx_drop = padapter->recvpriv.rx_drop;/* Calculate throughput in last interval */ - pdvobjpriv->traffic_stat.cur_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes - pdvobjpriv->traffic_stat.last_tx_bytes; - pdvobjpriv->traffic_stat.cur_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes - pdvobjpriv->traffic_stat.last_rx_bytes; + pdvobjpriv->traffic_stat.cur_tx_bytes = + pdvobjpriv->traffic_stat.tx_bytes - pdvobjpriv->traffic_stat.last_tx_bytes; + pdvobjpriv->traffic_stat.cur_rx_bytes = + pdvobjpriv->traffic_stat.rx_bytes - pdvobjpriv->traffic_stat.last_rx_bytes; pdvobjpriv->traffic_stat.last_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes; pdvobjpriv->traffic_stat.last_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes; - pdvobjpriv->traffic_stat.cur_tx_tp = (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes *8 /2 /1024 /1024 ); - pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); + pdvobjpriv->traffic_stat.cur_tx_tp = + (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes *8 /2 /1024 /1024 ); + pdvobjpriv->traffic_stat.cur_rx_tp = + (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); }bool traffic_status_watchdog (struct adapter *padapter,bool from_timer)
@@ -1743,7 +1747,11 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) pdrvextra_cmd = (struct drvextra_cmd_parm *)pbuf;switch (pdrvextra_cmd->ec_id) { -case DYNAMIC_CHK_WK_CID :/* only primary padapter go to this cmd, but execute dynamic_chk_wk_hdl() for two interfaces */ +case DYNAMIC_CHK_WK_CID : +/* +* only primary padapter go to this cmd, but execute +* dynamic_chk_wk_hdl() for two interfaces +*/ dynamic_chk_wk_hdl (padapter);break ;case POWER_SAVING_CTRL_WK_CID :
@@ -1881,7 +1889,10 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING);spin_unlock_bh (&pmlmepriv->scanned_queue.lock); -/* we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */ +/* +* we will set _FW_LINKED when there is one more sta +* to join us (rtw_stassoc_event_callback) +*/ } createbss_cmd_fail:
Signature · 1 line
2.53.0
Quoted 22 lines · Noah Techoueyres
Fix both block comments and assignment statements that exceed the 100-column limit to follow Linux guidelines for readability.
Signed-off-by Noah Techoueyres <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)drivers/staging/rtl8723bs/core/rtw_cmd.c +4
-2@@ -1117,13 +1117,17 @@ static void collect_traffic_statistics(struct adapter *padapter) pdvobjpriv->traffic_stat.rx_drop = padapter->recvpriv.rx_drop;/* Calculate throughput in last interval */ - pdvobjpriv->traffic_stat.cur_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes - pdvobjpriv->traffic_stat.last_tx_bytes; - pdvobjpriv->traffic_stat.cur_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes - pdvobjpriv->traffic_stat.last_rx_bytes; + pdvobjpriv->traffic_stat.cur_tx_bytes = + pdvobjpriv->traffic_stat.tx_bytes - pdvobjpriv->traffic_stat.last_tx_bytes; + pdvobjpriv->traffic_stat.cur_rx_bytes = + pdvobjpriv->traffic_stat.rx_bytes - pdvobjpriv->traffic_stat.last_rx_bytes;
drivers/staging/rtl8723bs/core/rtw_cmd.c static void collect_traffic_statistics(struct adapter *padapter) · line 1131
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +4
-2pdvobjpriv->traffic_stat.last_tx_bytes = pdvobjpriv->traffic_stat.tx_bytes; pdvobjpriv->traffic_stat.last_rx_bytes = pdvobjpriv->traffic_stat.rx_bytes; - pdvobjpriv->traffic_stat.cur_tx_tp = (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes *8 /2 /1024 /1024 ); - pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); + pdvobjpriv->traffic_stat.cur_tx_tp = + (u32)(pdvobjpriv->traffic_stat.cur_tx_bytes *8 /2 /1024 /1024 ); + pdvobjpriv->traffic_stat.cur_rx_tp = + (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); }
What about adding an intermediate pointer to traffic_stat? This will not only reduce the length of the lines, but will also make the code easier to read.
Thanks,
Nikolay
Quoted 30 lines
drivers/staging/rtl8723bs/core/rtw_cmd.c +9
-2bool traffic_status_watchdog (struct adapter *padapter,bool from_timer)@@ -1743,7 +1747,11 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) pdrvextra_cmd = (struct drvextra_cmd_parm *)pbuf;switch (pdrvextra_cmd->ec_id) { -case DYNAMIC_CHK_WK_CID :/* only primary padapter go to this cmd, but execute dynamic_chk_wk_hdl() for two interfaces */ +case DYNAMIC_CHK_WK_CID : +/* +* only primary padapter go to this cmd, but execute +* dynamic_chk_wk_hdl() for two interfaces +*/ dynamic_chk_wk_hdl (padapter);break ;case POWER_SAVING_CTRL_WK_CID :@@ -1881,7 +1889,10 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING);spin_unlock_bh (&pmlmepriv->scanned_queue.lock); -/* we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */ +/* +* we will set _FW_LINKED when there is one more sta +* to join us (rtw_stassoc_event_callback) +*/ } createbss_cmd_fail:Signature · 1 line
2.53.0