staging/rtl8192u: avoid Wempty-body warning
Subsystems (3)
PATCH 1/2 staging/rtl8192u: avoid Wempty-body warning
From: Arnd Bergmann <[email protected]>
This driver has a few disabled diagnostics, which can probably just get removed, or might still be helpful:
drivers/staging/rtl8192u/r8192U_core.c: In function 'rtl8192_set_rxconf':drivers/staging/rtl8192u/r8192U_core.c:767:45: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
767 | DMESG("NIC in promisc mode");
| ^drivers/staging/rtl8192u/r8192U_core.c: In function 'rtl819xusb_rx_command_packet':drivers/staging/rtl8192u/r8192U_core.c:883:80: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
883 | DMESG("rxcommandpackethandle819xusb: It is a command packet\n");
| ^
Changing the empty macro to no_printk() to shut up the compiler warnings and add format string checking.
--- drivers/staging/rtl8192u/r8192U.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/r8192U.h +3 -3
@@ -46,9 +46,9 @@#define KEY_BUF_SIZE 5#define RX_SMOOTH_FACTOR 20 -#define DMESG(x, a...) -#define DMESGW(x, a...) -#define DMESGE(x, a...) +#define DMESG(x, a...) no_printk(x, ##a) +#define DMESGW(x, a...) no_printk(x, ##a) +#define DMESGE(x, a...) no_printk(x, ##a)extern u32 rt_global_debug_component; #define RT_TRACE(component, x, args...) \ do { \
Signature · 1 line
2.29.2
PATCH 2/2 staging/nvec:: avoid Wempty-body warning
From: Arnd Bergmann <[email protected]>
This driver has a few disabled diagnostics, which can probably just get removed, or might still be helpful:
drivers/staging/nvec/nvec_ps2.c: In function 'nvec_ps2_notifier':drivers/staging/nvec/nvec_ps2.c:94:77: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
94 | NVEC_PHD("unhandled mouse event: ", msg, msg[1] + 2);
Changing the empty macro to the usual 'do {} while (0)' at least shuts up the compiler warnings.
--- drivers/staging/nvec/nvec_ps2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/nvec/nvec_ps2.c +1 -1
@@ -28,7 +28,7 @@print_hex_dump (KERN_DEBUG , str,DUMP_PREFIX_NONE , \ 16, 1, buf, len, false)#else -#define NVEC_PHD (str, buf, len) +#define NVEC_PHD (str, buf, len) do { } while (0)#endif enum ps2_subcmds {
Signature · 1 line
2.29.2