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

media: flexcop: avoid -Wempty-body warning

Building with 'make W=1' shows many warnings -Wempty-body warnings like

drivers/media/common/b2c2/flexcop-misc.c: In function 'flexcop_determine_revision':
drivers/media/common/b2c2/flexcop-misc.c:35:85: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
35 | deb_info("this FlexCop has the 6 basic main hardware pid filter.\n");

drivers/media/usb/b2c2/flexcop-usb.c: In function 'flexcop_usb_process_frame':
drivers/media/usb/b2c2/flexcop-usb.c:357:79: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
357 | deb_ts("not ts packet %*ph\n", 4, b+2);
| ^
drivers/media/common/b2c2/flexcop-misc.c: In function 'flexcop_determine_revision':
drivers/media/common/b2c2/flexcop-misc.c:35:85: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
35 | deb_info("this FlexCop has the 6 basic main hardware pid filter.\n");
| ^

Change the empty dprintk() macros to no_printk(), which avoids this
warning and adds format string checking.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Arnd Bergmann and committed by
Mauro Carvalho Chehab
d6bed580 49e851de

+10 -10
+3 -3
drivers/media/common/b2c2/flexcop.h
··· 14 14 15 15 /* debug */ 16 16 #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG 17 - #define dprintk(level,args...) \ 18 - do { if ((b2c2_flexcop_debug & level)) printk(args); } while (0) 17 + #define dprintk(level, args...) \ 18 + do { if ((b2c2_flexcop_debug & (level))) printk(args); } while (0) 19 19 #else 20 - #define dprintk(level,args...) 20 + #define dprintk(level, args...) no_printk(args) 21 21 #endif 22 22 23 23 #define deb_info(args...) dprintk(0x01, args)
+3 -3
drivers/media/pci/b2c2/flexcop-pci.c
··· 18 18 MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ streaming watchdog."); 19 19 20 20 #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG 21 - #define dprintk(level,args...) \ 22 - do { if ((debug & level)) printk(args); } while (0) 21 + #define dprintk(level, args...) \ 22 + do { if ((debug & (level))) printk(args); } while (0) 23 23 #define DEBSTATUS "" 24 24 #else 25 - #define dprintk(level,args...) 25 + #define dprintk(level, args...) no_printk(args) 26 26 #define DEBSTATUS " (debugging is not enabled)" 27 27 #endif 28 28
+4 -4
drivers/media/usb/b2c2/flexcop-usb.c
··· 15 15 16 16 /* debug */ 17 17 #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG 18 - #define dprintk(level,args...) \ 19 - do { if ((debug & level)) printk(args); } while (0) 18 + #define dprintk(level, args...) \ 19 + do { if ((debug & (level))) printk(args); } while (0) 20 20 21 21 #define debug_dump(b, l, method) do {\ 22 22 int i; \ ··· 27 27 28 28 #define DEBSTATUS "" 29 29 #else 30 - #define dprintk(level, args...) 31 - #define debug_dump(b, l, method) 30 + #define dprintk(level, args...) no_printk(args) 31 + #define debug_dump(b, l, method) do { } while (0) 32 32 #define DEBSTATUS " (debugging is not enabled)" 33 33 #endif 34 34