Commit d6bed580 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 49e851de

drivers/media/common/b2c2/flexcop.h

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ extern int b2c2_flexcop_debug; 
/* debug */

#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG

#define dprintk(level, args...) \

	do { if ((b2c2_flexcop_debug & level)) printk(args); } while (0)

	do { if ((b2c2_flexcop_debug & (level))) printk(args); } while (0)

#else

#define dprintk(level,args...)

#define dprintk(level, args...) no_printk(args)

#endif



#define deb_info(args...) dprintk(0x01, args)

drivers/media/pci/b2c2/flexcop-pci.c

+3 −3
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ streaming watchdog."); 


#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG

#define dprintk(level, args...) \

	do { if ((debug & level)) printk(args); } while (0)

	do { if ((debug & (level))) printk(args); } while (0)

#define DEBSTATUS ""

#else

#define dprintk(level,args...)

#define dprintk(level, args...) no_printk(args)

#define DEBSTATUS " (debugging is not enabled)"

#endif

drivers/media/usb/b2c2/flexcop-usb.c

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/* debug */

#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG

#define dprintk(level, args...) \

	do { if ((debug & level)) printk(args); } while (0)

	do { if ((debug & (level))) printk(args); } while (0)



#define debug_dump(b, l, method) do {\

	int i; \
@@ -27,8 +27,8 @@ 


#define DEBSTATUS ""

#else

#define dprintk(level, args...)

#define debug_dump(b, l, method)

#define dprintk(level, args...) no_printk(args)

#define debug_dump(b, l, method) do { } while (0)

#define DEBSTATUS " (debugging is not enabled)"

#endif