Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8723bs: fix empty-body warning

The newly added driver causes lots of warnings like

drivers/staging/rtl8723bs/core/rtw_recv.c: In function 'validate_recv_frame':
drivers/staging/rtl8723bs/core/rtw_recv.c:1602:4: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
DBG_COUNTER(adapter->rx_logs.core_rx_pre_data_handled);
drivers/staging/rtl8723bs/core/rtw_xmit.c: In function 'update_attrib':
drivers/staging/rtl8723bs/core/rtw_xmit.c:726:3: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_unknown);
drivers/staging/rtl8723bs/hal/HalPhyRf.c: In function 'ODM_TXPowerTrackingCallback_ThermalMeter':
drivers/staging/rtl8723bs/hal/HalPhyRf.c:146:4: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
drivers/staging/rtl8723bs/hal/HalPhyRf.c:529:6: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
drivers/staging/rtl8723bs/hal/HalPhyRf.c:559:6: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]

When DBG_COUNTER() etc is defined as a non-empty macro, we get the intended
behavior and no warning. Using no_printk() for printing helper functions
as the added advantage of compile-time checking format strings

Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Arnd Bergmann and committed by
Greg Kroah-Hartman
c45112e4 b40f7808

+14 -12
+5 -4
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
··· 165 165 } 166 166 167 167 #else 168 - #define BTC_PRINT(dbgtype, dbgflag, printstr) 169 - #define BTC_PRINT_F(dbgtype, dbgflag, printstr) 170 - #define BTC_PRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) 171 - #define BTC_PRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) 168 + #define BTC_PRINT(dbgtype, dbgflag, printstr) no_printk printstr 169 + #define BTC_PRINT_F(dbgtype, dbgflag, printstr) no_printk printstr 170 + #define BTC_PRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) no_printk printstr 171 + #define BTC_PRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen) \ 172 + no_printk("%s %p %zu", _TitleString, _HexData, _HexDataLen) 172 173 #endif 173 174 174 175 typedef struct _BTC_BOARD_INFO {
+8 -7
drivers/staging/rtl8723bs/hal/odm_debug.h
··· 151 151 DbgPrint("\n");\ 152 152 } 153 153 #else 154 - #define ODM_RT_TRACE(pDM_Odm, comp, level, fmt) 155 - #define ODM_RT_TRACE_F(pDM_Odm, comp, level, fmt) 156 - #define ODM_RT_ASSERT(pDM_Odm, expr, fmt) 157 - #define ODM_dbg_enter() 158 - #define ODM_dbg_exit() 159 - #define ODM_dbg_trace(str) 160 - #define ODM_PRINT_ADDR(pDM_Odm, comp, level, title_str, ptr) 154 + #define ODM_RT_TRACE(pDM_Odm, comp, level, fmt) no_printk fmt 155 + #define ODM_RT_TRACE_F(pDM_Odm, comp, level, fmt) no_printk fmt 156 + #define ODM_RT_ASSERT(pDM_Odm, expr, fmt) no_printk fmt 157 + #define ODM_dbg_enter() do {} while (0) 158 + #define ODM_dbg_exit() do {} while (0) 159 + #define ODM_dbg_trace(str) no_printk("%s", str) 160 + #define ODM_PRINT_ADDR(pDM_Odm, comp, level, title_str, ptr) \ 161 + no_printk("%s %p", title_str, ptr) 161 162 #endif 162 163 163 164 void ODM_InitDebugSetting(PDM_ODM_T pDM_Odm);
+1 -1
drivers/staging/rtl8723bs/include/rtw_debug.h
··· 263 263 #ifdef CONFIG_DBG_COUNTER 264 264 #define DBG_COUNTER(counter) counter++ 265 265 #else 266 - #define DBG_COUNTER(counter) 266 + #define DBG_COUNTER(counter) do {} while (0) 267 267 #endif 268 268 269 269 void dump_drv_version(void *sel);