staging: rtl8723bs: replace DBG_871X_SEL_NL macro with netdev_dbg()
cover staging: rtl8723bs: replace DBG_871X_SEL_NL macro with netdev_dbg()
This patchset replaces DGB_871X_SEL_NL macro with the driver recommended log function netdev_dbg().
Macro DBG_871X_SEL_NL indeed executes a raw printk call as default behaviour. The other behaviour is doing a seq_printf() call which never occurs.
First patch replace dump_drv_version with a netdev_dbg() call. Second patch remove an unnecessary dump_drv_version() usage. Third patch removes dump_drv_version() now unused and
unused dump_log_level() as well
Fourth patch apply the following coccinelle script for macro bulk replacement:
@@
expression sel;
expression list args;
identifier padapter;
identifier func;
@@
func(..., struct adapter *padapter, ...) {
<...
- DBG_871X_SEL_NL(sel, args);
+ netdev_dbg(padapter->pnetdev, args);
...>
}Fifth patch fixes a post commit checkpatch issue left by coccinelle output.
Sixth patch removes DBG_871X_SEL_NL macro declaration. Seventh patch removes an unused function argument after macro replacement.
Fabio Aiuto (7):
staging: rtl8723bs: replace dump_drv_version() usage with netdev_dbg()
staging: rtl8723bs: remove unnecessary dump_drv_version() usage
staging: rtl8723bs: remove two unused functions
staging: rtl8723bs: replace DBG_871X_SEL_NL with netdev_dbg()
staging: rtl8723bs: put a new line after ';'
staging: rtl8723bs: remove DBG_871X_SEL_NL macro declaration
staging: rtl8723bs: remove unused argument in function
drivers/staging/rtl8723bs/core/rtw_debug.c | 26 +++------- drivers/staging/rtl8723bs/core/rtw_odm.c | 52 ++++++++++--------- drivers/staging/rtl8723bs/hal/hal_com.c | 31 +++++------ drivers/staging/rtl8723bs/include/rtw_debug.h | 12 ----- drivers/staging/rtl8723bs/include/rtw_odm.h | 2 +- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 4 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 - 7 files changed, 51 insertions(+), 77 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/7 staging: rtl8723bs: replace dump_drv_version() usage with netdev_dbg()
replace dump_drv_version() usage with netdev_dbg().
There's no need to further wrap a netdev_dbg() call for such a low number of occurrences.
The string printed is the same contained in DBG_871X_SEL_NL macro called inside dump_drv_version().
This is just preparation before bulk DBG_871X_SEL_NL macro replacement by coccinelle, as the semantic patch that will be used just replaces, doesn't remove.
--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +1 -1
@@ -2590,7 +2590,7 @@ static int rtw_dbg_port(struct net_device *dev,break ;case 0x10 :/* driver version display */ -dump_drv_version (RTW_DBGDUMP ); +netdev_dbg (dev,"%s %s\n" ,"rtl8723bs" ,DRIVERVERSION );break ;case 0x11 :/* dump linked status */ {
Signature · 1 line
2.20.1
PATCH 2/7 staging: rtl8723bs: remove unnecessary dump_drv_version() usage
In reply to Fabio Aiutoremove unnecessary dump_drv_version() usage.
This prepares dump_drv_version() for removal, before coccinelle script application.
--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +0 -1
@@ -491,7 +491,6 @@ static int __init rtw_drv_entry(void)int ret;DBG_871X_LEVEL (_drv_always_,"module init start\n" ); -dump_drv_version (RTW_DBGDUMP );#ifdef BTCOEXVERSION DBG_871X_LEVEL (_drv_always_,"rtl8723bs BT-Coex version = %s\n" ,BTCOEXVERSION );#endif /* BTCOEXVERSION */
Signature · 1 line
2.20.1
PATCH 3/7 staging: rtl8723bs: remove two unused functions
In reply to Fabio Aiutoremove dump_drv_version() and dump_log_level() function definitions and prototypes. Those functions are unused, and add unnecessary wrap level to log calls.
They wrap DBG_871X_SEL_NL which will be replaced by netdev_dbg() with coccinelle script application.
--- drivers/staging/rtl8723bs/core/rtw_debug.c | 10 ---------- drivers/staging/rtl8723bs/include/rtw_debug.h | 3 --- 2 files changed, 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_debug.c +0 -10
@@ -14,16 +14,6 @@ u32 GlobalDebugLevel = _drv_err_;#include <rtw_version.h> -void dump_drv_version (void *sel) -{ -DBG_871X_SEL_NL (sel,"%s %s\n" ,"rtl8723bs" ,DRIVERVERSION ); -} - -void dump_log_level (void *sel) -{ -DBG_871X_SEL_NL (sel,"log_level:%d\n" , GlobalDebugLevel); -} -void sd_f0_reg_dump (void *sel,struct adapter *adapter) {int i;
drivers/staging/rtl8723bs/include/rtw_debug.h +0 -3
@@ -192,9 +192,6 @@#endif /* defined(_dbgdump) */ -void dump_drv_version (void *sel); -void dump_log_level (void *sel); -void sd_f0_reg_dump (void *sel,struct adapter *adapter);void mac_reg_dump (void *sel,struct adapter *adapter);
Signature · 1 line
2.20.1
PATCH 4/7 staging: rtl8723bs: replace DBG_871X_SEL_NL with netdev_dbg()
In reply to Fabio Aiutoreplace DGB_871X_SEL_NL macro with netdev_dbg().
DBG_871X_SEL_NL macro expands to a raw prink call or a seq_printf if selected stream _is not_ a local debug symbol set to null.
This second scenario never occurs so replace all macro usages with netdev_dbg().
This is done with the following coccinelle script:
@@
expression sel;
expression list args;
identifier padapter;
identifier func;
@@
func(..., struct adapter *padapter, ...) {
<...
- DBG_871X_SEL_NL(sel, args);
+ netdev_dbg(padapter->pnetdev, args);
...>
}--- drivers/staging/rtl8723bs/core/rtw_debug.c | 16 +++---- drivers/staging/rtl8723bs/core/rtw_odm.c | 49 +++++++++++----------- drivers/staging/rtl8723bs/hal/hal_com.c | 31 ++++++-------- 3 files changed, 46 insertions(+), 50 deletions(-)
drivers/staging/rtl8723bs/core/rtw_debug.c +8 -8
@@ -20,7 +20,7 @@ void sd_f0_reg_dump(void *sel, struct adapter *adapter)for (i =0x0 ; i <=0xff ; i++) {if (i%16 ==0 ) -DBG_871X_SEL_NL (sel,"0x%02x " , i); +netdev_dbg (adapter->pnetdev,"0x%02x " , i);DBG_871X_SEL (sel,"%02x " ,rtw_sd_f0_read8 (adapter, i));
@@ -35,11 +35,11 @@ void mac_reg_dump(void *sel, struct adapter *adapter) {int i, j =1 ; -DBG_871X_SEL_NL (sel,"======= MAC REG =======\n" ); +netdev_dbg (adapter->pnetdev,"======= MAC REG =======\n" );for (i =0x0 ; i <0x800 ; i +=4 ) {if (j%4 ==1 ) -DBG_871X_SEL_NL (sel,"0x%03x" , i); +netdev_dbg (adapter->pnetdev,"0x%03x" , i);DBG_871X_SEL (sel," 0x%08x " ,rtw_read32 (adapter, i));if ((j++)%4 ==0 )DBG_871X_SEL (sel,"\n" );
@@ -50,10 +50,10 @@ void bb_reg_dump(void *sel, struct adapter *adapter) {int i, j =1 ; -DBG_871X_SEL_NL (sel,"======= BB REG =======\n" ); +netdev_dbg (adapter->pnetdev,"======= BB REG =======\n" );for (i =0x800 ; i <0x1000 ; i +=4 ) {if (j%4 ==1 ) -DBG_871X_SEL_NL (sel,"0x%03x" , i); +netdev_dbg (adapter->pnetdev,"0x%03x" , i);DBG_871X_SEL (sel," 0x%08x " ,rtw_read32 (adapter, i));if ((j++)%4 ==0 )DBG_871X_SEL (sel,"\n" );
@@ -73,14 +73,14 @@ void rf_reg_dump(void *sel, struct adapter *adapter)else path_nums =2 ; -DBG_871X_SEL_NL (sel,"======= RF REG =======\n" ); +netdev_dbg (adapter->pnetdev,"======= RF REG =======\n" );for (path =0 ; path < path_nums; path++) { -DBG_871X_SEL_NL (sel,"RF_Path(%x)\n" , path); +netdev_dbg (adapter->pnetdev,"RF_Path(%x)\n" , path);for (i =0 ; i <0x100 ; i++) { value =rtw_hal_read_rfreg (adapter, path, i,0xffffffff );if (j%4 ==1 ) -DBG_871X_SEL_NL (sel,"0x%02x " , i); +netdev_dbg (adapter->pnetdev,"0x%02x " , i);DBG_871X_SEL (sel," 0x%08x " , value);if ((j++)%4 ==0 )DBG_871X_SEL (sel,"\n" );
drivers/staging/rtl8723bs/core/rtw_odm.c +25 -24
83 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/hal_com.c +13 -18
@@ -1522,12 +1522,10 @@ void rtw_get_raw_rssi_info(void *sel, struct adapter *padapter)struct hal_com_data *pHalData =GET_HAL_DATA (padapter);struct rx_raw_rssi *psample_pkt_rssi = &padapter->recvpriv.raw_rssi_info; -DBG_871X_SEL_NL ( - sel, -"RxRate = %s, PWDBALL = %d(%%), rx_pwr_all = %d(dBm)\n" , -HDATA_RATE (psample_pkt_rssi->data_rate), - psample_pkt_rssi->pwdball, psample_pkt_rssi->pwr_all - ); +netdev_dbg (padapter->pnetdev, +"RxRate = %s, PWDBALL = %d(%%), rx_pwr_all = %d(dBm)\n" , +HDATA_RATE (psample_pkt_rssi->data_rate), + psample_pkt_rssi->pwdball, psample_pkt_rssi->pwr_all); isCCKrate = psample_pkt_rssi->data_rate <=DESC_RATE11M ;
@@ -1535,20 +1533,17 @@ void rtw_get_raw_rssi_info(void *sel, struct adapter *padapter) psample_pkt_rssi->mimo_signal_strength[0 ] = psample_pkt_rssi->pwdball;for (rf_path =0 ; rf_path < pHalData->NumTotalRFPath; rf_path++) { -DBG_871X_SEL_NL ( - sel, -"RF_PATH_%d =>signal_strength:%d(%%), signal_quality:%d(%%)\n" , - rf_path, psample_pkt_rssi->mimo_signal_strength[rf_path], - psample_pkt_rssi->mimo_signal_quality[rf_path] - ); +netdev_dbg (padapter->pnetdev, +"RF_PATH_%d =>signal_strength:%d(%%), signal_quality:%d(%%)\n" , + rf_path, + psample_pkt_rssi->mimo_signal_strength[rf_path], + psample_pkt_rssi->mimo_signal_quality[rf_path]);if (!isCCKrate) { -DBG_871X_SEL_NL ( - sel, -"\trx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n" , - psample_pkt_rssi->ofdm_pwr[rf_path], - psample_pkt_rssi->ofdm_snr[rf_path] - ); +netdev_dbg (padapter->pnetdev, +"\trx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n" , + psample_pkt_rssi->ofdm_pwr[rf_path], + psample_pkt_rssi->ofdm_snr[rf_path]); } } }
Signature · 1 line
2.20.1
PATCH 5/7 staging: rtl8723bs: put a new line after ';'
In reply to Fabio Aiutofix the following post commit hook checkpatch issue:
ERROR: space required after that ';' (ctx:VxV) 232: FILE: drivers/staging/rtl8723bs/core/rtw_odm.c:160:
+ "AdapEn_RSSI", "IGI_LowerBound");netdev_dbg
(adapter->pnetdev,
This was coccinelle script output coding style issue.
--- drivers/staging/rtl8723bs/core/rtw_odm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_odm.c +9 -8
@@ -157,14 +157,15 @@ void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter)netdev_dbg (adapter->pnetdev,"%10s %16s %8s %10s %11s %14s\n" ,"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" ,"ForceEDCCA" , -"AdapEn_RSSI" ,"IGI_LowerBound" );netdev_dbg (adapter->pnetdev, -"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , - (u8 )odm->TH_L2H_ini, - odm->TH_EDCCA_HL_diff, - odm->IGI_Base, - odm->ForceEDCCA, - odm->AdapEn_RSSI, - odm->IGI_LowerBound); +"AdapEn_RSSI" ,"IGI_LowerBound" ); +netdev_dbg (adapter->pnetdev, +"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , + (u8 )odm->TH_L2H_ini, + odm->TH_EDCCA_HL_diff, + odm->IGI_Base, + odm->ForceEDCCA, + odm->AdapEn_RSSI, + odm->IGI_LowerBound); } void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini,
Signature · 1 line
2.20.1
PATCH 6/7 staging: rtl8723bs: remove DBG_871X_SEL_NL macro declaration
In reply to Fabio Aiutoremove DBG_871X_SEL_NL obsolete macro declaration.
--- drivers/staging/rtl8723bs/include/rtw_debug.h | 9 --------- 1 file changed, 9 deletions(-)
drivers/staging/rtl8723bs/include/rtw_debug.h +0 -9
@@ -181,15 +181,6 @@ seq_printf(sel, fmt, ##arg); \ } while (0) -/* dump message to selected 'stream' with driver-defined prefix */ -#define DBG_871X_SEL_NL(sel, fmt, arg...) \ - do { \ - if (sel == RTW_DBGDUMP) \ - DBG_871X_LEVEL(_drv_always_, fmt, ##arg); \ - else \ - seq_printf(sel, fmt, ##arg); \ - } while (0) -#endif /* defined(_dbgdump) */ void sd_f0_reg_dump (void *sel,struct adapter *adapter);
Signature · 1 line
2.20.1
PATCH 7/7 staging: rtl8723bs: remove unused argument in function
In reply to Fabio Aiutoremoved unused 'void *sel' argument in rtw_odm_dbg_comp_msg() function, after DBG_871X_SEL_NL replacement.
--- drivers/staging/rtl8723bs/core/rtw_odm.c | 2 +- drivers/staging/rtl8723bs/include/rtw_odm.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_odm.c +1 -1
@@ -90,7 +90,7 @@ static const char * const odm_dbg_level_str[] = {#define RTW_ODM_DBG_LEVEL_NUM 6 -void rtw_odm_dbg_comp_msg (void *sel,struct adapter *adapter) +void rtw_odm_dbg_comp_msg (struct adapter *adapter) {u64 dbg_comp;int i;
drivers/staging/rtl8723bs/include/rtw_odm.h +1 -1
@@ -13,7 +13,7 @@* This file provides utilities/wrappers for rtw driver to use ODM */ -void rtw_odm_dbg_comp_msg (void *sel,struct adapter *adapter); +void rtw_odm_dbg_comp_msg (struct adapter *adapter);void rtw_odm_dbg_comp_set (struct adapter *adapter,u64 comps);void rtw_odm_dbg_level_msg (void *sel,struct adapter *adapter);void rtw_odm_dbg_level_set (struct adapter *adapter,u32 level);
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +1 -1
@@ -2622,7 +2622,7 @@ static int rtw_dbg_port(struct net_device *dev,case 0x16 : {if (arg ==0xff ) { -rtw_odm_dbg_comp_msg (RTW_DBGDUMP , padapter); +rtw_odm_dbg_comp_msg (padapter); }else {u64 dbg_comp = (u64 )extra_arg;rtw_odm_dbg_comp_set (padapter, dbg_comp);
Signature · 1 line
2.20.1
Greg KH
maintainerRe: [PATCH 5/7] staging: rtl8723bs: put a new line after ';'
In reply to Fabio AiutoQuoted 44 lines · Fabio Aiuto
fix the following post commit hook checkpatch issue:
ERROR: space required after that ';' (ctx:VxV) 232: FILE:
drivers/staging/rtl8723bs/core/rtw_odm.c:160:(quoted diff) +1
-0+ "AdapEn_RSSI", "IGI_LowerBound");netdev_dbg(adapter->pnetdev,This was coccinelle script output coding style issue.
Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_odm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)drivers/staging/rtl8723bs/core/rtw_odm.c +9
-8@@ -157,14 +157,15 @@ void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter)netdev_dbg (adapter->pnetdev,"%10s %16s %8s %10s %11s %14s\n" ,"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" ,"ForceEDCCA" , -"AdapEn_RSSI" ,"IGI_LowerBound" );netdev_dbg (adapter->pnetdev, -"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , - (u8 )odm->TH_L2H_ini, - odm->TH_EDCCA_HL_diff, - odm->IGI_Base, - odm->ForceEDCCA, - odm->AdapEn_RSSI, - odm->IGI_LowerBound); +"AdapEn_RSSI" ,"IGI_LowerBound" ); +netdev_dbg (adapter->pnetdev, +"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , + (u8 )odm->TH_L2H_ini, + odm->TH_EDCCA_HL_diff, + odm->IGI_Base, + odm->ForceEDCCA, + odm->AdapEn_RSSI, + odm->IGI_LowerBound); } void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini,Signature · 1 line
2.20.1
This patch should not be needed, your commit that caused this error should not have done so. Please fix that instead.
thanks,
greg k-h
Greg KH
maintainerRe: [PATCH 4/7] staging: rtl8723bs: replace DBG_871X_SEL_NL with netdev_dbg()
In reply to Fabio AiutoQuoted 158 lines · Fabio Aiuto
replace
DGB_871X_SEL_NLmacro withnetdev_dbg().
DBG_871X_SEL_NLmacro expands to a raw prink call or aseq_printfif selected stream_isnot_a local debug symbol set to null.
This second scenario never occurs so replace all macro usages withnetdev_dbg().This is done with the following coccinelle script:
@@
expression sel;
expression list args;
identifier padapter;
identifier func;
@@func(..., struct adapter *padapter, ...) { <...(quoted diff) +1
-1- DBG_871X_SEL_NL(sel, args); + netdev_dbg(padapter->pnetdev, args);...> }Signed-off-by Fabio Aiuto <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_debug.c | 16 +++---- drivers/staging/rtl8723bs/core/rtw_odm.c | 49 +++++++++++----------- drivers/staging/rtl8723bs/hal/hal_com.c | 31 ++++++-------- 3 files changed, 46 insertions(+), 50 deletions(-)drivers/staging/rtl8723bs/core/rtw_debug.c +8
-8@@ -20,7 +20,7 @@ void sd_f0_reg_dump(void *sel, struct adapter *adapter)for (i =0x0 ; i <=0xff ; i++) {if (i%16 ==0 ) -DBG_871X_SEL_NL (sel,"0x%02x " , i); +netdev_dbg (adapter->pnetdev,"0x%02x " , i);DBG_871X_SEL (sel,"%02x " ,rtw_sd_f0_read8 (adapter, i));@@ -35,11 +35,11 @@ void mac_reg_dump(void *sel, struct adapter *adapter) {int i, j =1 ; -DBG_871X_SEL_NL (sel,"======= MAC REG =======\n" ); +netdev_dbg (adapter->pnetdev,"======= MAC REG =======\n" );for (i =0x0 ; i <0x800 ; i +=4 ) {if (j%4 ==1 ) -DBG_871X_SEL_NL (sel,"0x%03x" , i); +netdev_dbg (adapter->pnetdev,"0x%03x" , i);DBG_871X_SEL (sel," 0x%08x " ,rtw_read32 (adapter, i));if ((j++)%4 ==0 )DBG_871X_SEL (sel,"\n" );@@ -50,10 +50,10 @@ void bb_reg_dump(void *sel, struct adapter *adapter) {int i, j =1 ; -DBG_871X_SEL_NL (sel,"======= BB REG =======\n" ); +netdev_dbg (adapter->pnetdev,"======= BB REG =======\n" );for (i =0x800 ; i <0x1000 ; i +=4 ) {if (j%4 ==1 ) -DBG_871X_SEL_NL (sel,"0x%03x" , i); +netdev_dbg (adapter->pnetdev,"0x%03x" , i);DBG_871X_SEL (sel," 0x%08x " ,rtw_read32 (adapter, i));if ((j++)%4 ==0 )DBG_871X_SEL (sel,"\n" );@@ -73,14 +73,14 @@ void rf_reg_dump(void *sel, struct adapter *adapter)else path_nums =2 ; -DBG_871X_SEL_NL (sel,"======= RF REG =======\n" ); +netdev_dbg (adapter->pnetdev,"======= RF REG =======\n" );for (path =0 ; path < path_nums; path++) { -DBG_871X_SEL_NL (sel,"RF_Path(%x)\n" , path); +netdev_dbg (adapter->pnetdev,"RF_Path(%x)\n" , path);for (i =0 ; i <0x100 ; i++) { value =rtw_hal_read_rfreg (adapter, path, i,0xffffffff );if (j%4 ==1 ) -DBG_871X_SEL_NL (sel,"0x%02x " , i); +netdev_dbg (adapter->pnetdev,"0x%02x " , i);DBG_871X_SEL (sel," 0x%08x " , value);if ((j++)%4 ==0 )DBG_871X_SEL (sel,"\n" );drivers/staging/rtl8723bs/core/rtw_odm.c +12
-22@@ -96,12 +96,13 @@ void rtw_odm_dbg_comp_msg(void *sel, struct adapter *adapter)int i;rtw_hal_get_def_var (adapter,HW_DEF_ODM_DBG_FLAG , &dbg_comp); -DBG_871X_SEL_NL (sel,"odm.DebugComponents = 0x%016llx\n" , dbg_comp); +netdev_dbg (adapter->pnetdev,"odm.DebugComponents = 0x%016llx\n" , + dbg_comp);for (i =0 ; i <RTW_ODM_COMP_MAX ; i++) {if (odm_comp_str[i]) -DBG_871X_SEL_NL (sel,"%cBIT%-2d %s\n" , - (BIT0 << i) & dbg_comp ?'+' :' ' , - i, odm_comp_str[i]); +netdev_dbg (adapter->pnetdev,"%cBIT%-2d %s\n" , + (BIT0 << i) & dbg_comp ?'+' :' ' , i, + odm_comp_str[i]); } }@@ -116,11 +117,11 @@ void rtw_odm_dbg_level_msg(void *sel, struct adapter *adapter)int i;rtw_hal_get_def_var (adapter,HW_DEF_ODM_DBG_LEVEL , &dbg_level); -DBG_871X_SEL_NL (sel,"odm.DebugLevel = %u\n" , dbg_level); +netdev_dbg (adapter->pnetdev,"odm.DebugLevel = %u\n" , dbg_level);for (i =0 ; i <RTW_ODM_DBG_LEVEL_NUM ; i++) {if (odm_dbg_level_str[i]) -DBG_871X_SEL_NL (sel,"%u %s\n" , - i, odm_dbg_level_str[i]); +netdev_dbg (adapter->pnetdev,"%u %s\n" , i, + odm_dbg_level_str[i]); } }@@ -135,12 +136,12 @@ void rtw_odm_ability_msg(void *sel, struct adapter *adapter)int i;rtw_hal_get_hwreg (adapter,HW_VAR_DM_FLAG , (u8 *)&ability); -DBG_871X_SEL_NL (sel,"odm.SupportAbility = 0x%08x\n" , ability); +netdev_dbg (adapter->pnetdev,"odm.SupportAbility = 0x%08x\n" , ability);for (i =0 ; i <RTW_ODM_ABILITY_MAX ; i++) {if (odm_ability_str[i]) -DBG_871X_SEL_NL (sel,"%cBIT%-2d %s\n" , - (BIT0 << i) & ability ?'+' :' ' , i, - odm_ability_str[i]); +netdev_dbg (adapter->pnetdev,"%cBIT%-2d %s\n" , + (BIT0 << i) & ability ?'+' :' ' , i, + odm_ability_str[i]); } }@@ -154,17 +155,16 @@ void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter)struct hal_com_data *pHalData =GET_HAL_DATA (adapter);struct dm_odm_t *odm = &pHalData->odmpriv; -DBG_871X_SEL_NL (sel,"%10s %16s %8s %10s %11s %14s\n" , -"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" , -"ForceEDCCA" ,"AdapEn_RSSI" ,"IGI_LowerBound" ); -DBG_871X_SEL_NL (sel,"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , - (u8 )odm->TH_L2H_ini, - odm->TH_EDCCA_HL_diff, - odm->IGI_Base, - odm->ForceEDCCA, - odm->AdapEn_RSSI, - odm->IGI_LowerBound - );
drivers/staging/rtl8723bs/core/rtw_odm.c void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter) · line 167
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_odm.c +10
-0+netdev_dbg (adapter->pnetdev,"%10s %16s %8s %10s %11s %14s\n" , +"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" ,"ForceEDCCA" , +"AdapEn_RSSI" ,"IGI_LowerBound" );netdev_dbg (adapter->pnetdev, +"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , + (u8 )odm->TH_L2H_ini, + odm->TH_EDCCA_HL_diff, + odm->IGI_Base, + odm->ForceEDCCA, + odm->AdapEn_RSSI, + odm->IGI_LowerBound);
Something went wrong with this change :(
Re: [PATCH 4/7] staging: rtl8723bs: replace DBG_871X_SEL_NL with netdev_dbg()
Quoted 15 lines · Greg KH
Quoted 15 lines
drivers/staging/rtl8723bs/core/rtw_odm.c +4
-11-DBG_871X_SEL_NL (sel,"%10s %16s %8s %10s %11s %14s\n" , -"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" , -"ForceEDCCA" ,"AdapEn_RSSI" ,"IGI_LowerBound" ); -DBG_871X_SEL_NL (sel,"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , - (u8 )odm->TH_L2H_ini, - odm->TH_EDCCA_HL_diff, - odm->IGI_Base, - odm->ForceEDCCA, - odm->AdapEn_RSSI, - odm->IGI_LowerBound - ); +netdev_dbg (adapter->pnetdev,"%10s %16s %8s %10s %11s %14s\n" , +"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" ,"ForceEDCCA" , + "AdapEn_RSSI", "IGI_LowerBound");netdev_dbg(adapter->pnetdev, + "0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n",
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_odm.c void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter) · line 167
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_odm.c +6
-0+ (u8 )odm->TH_L2H_ini, + odm->TH_EDCCA_HL_diff, + odm->IGI_Base, + odm->ForceEDCCA, + odm->AdapEn_RSSI, + odm->IGI_LowerBound);Something went wrong with this change :(
thanks Greg, I sent an example to Julia, that reproduce the problem. As soon as it gets fixed I will send you a v2.
fabio
Greg KH
maintainerRe: [PATCH 4/7] staging: rtl8723bs: replace DBG_871X_SEL_NL with netdev_dbg()
Quoted 25 lines · Fabio Aiuto
Quoted 15 lines · Greg KH
Quoted 15 lines
drivers/staging/rtl8723bs/core/rtw_odm.c +4
-11-DBG_871X_SEL_NL (sel,"%10s %16s %8s %10s %11s %14s\n" , -"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" , -"ForceEDCCA" ,"AdapEn_RSSI" ,"IGI_LowerBound" ); -DBG_871X_SEL_NL (sel,"0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n" , - (u8 )odm->TH_L2H_ini, - odm->TH_EDCCA_HL_diff, - odm->IGI_Base, - odm->ForceEDCCA, - odm->AdapEn_RSSI, - odm->IGI_LowerBound - ); +netdev_dbg (adapter->pnetdev,"%10s %16s %8s %10s %11s %14s\n" , +"TH_L2H_ini" ,"TH_EDCCA_HL_diff" ,"IGI_Base" ,"ForceEDCCA" , + "AdapEn_RSSI", "IGI_LowerBound");netdev_dbg(adapter->pnetdev, + "0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n",Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_odm.c void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter) · line 167
Quoted 6 lines
drivers/staging/rtl8723bs/core/rtw_odm.c +6
-0+ (u8 )odm->TH_L2H_ini, + odm->TH_EDCCA_HL_diff, + odm->IGI_Base, + odm->ForceEDCCA, + odm->AdapEn_RSSI, + odm->IGI_LowerBound);Something went wrong with this change :(
Quoted 2 lines
thanks Greg, I sent an example to Julia, that reproduce the problem. As soon as it gets fixed I will send you a v2.
You can fix it up yourself "by hand" for now, no need to wait for a tool fix :)