Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 4513fc696e273d64ea32f2366748aed810316ecc

Authored by Steven Toth
Committed by Mauro Carvalho Chehab
1 parent d685a483b8
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (7014): cx23885: dprintk macro cleanup 

Added missing do { } while (0)

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 5 changed files with 24 additions and 17 deletions Side-by-side Diff

drivers/media/video/cx23885/cx23885-core.c
Diff comments   View file @ 4513fc6
... ... @@ -36,7 +36,7 @@
36 36 MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>");
37 37 MODULE_LICENSE("GPL");
38 38  
39   -static unsigned int debug = 0;
  39 +static unsigned int debug;
40 40 module_param(debug,int,0644);
41 41 MODULE_PARM_DESC(debug,"enable debug messages");
42 42  
... ... @@ -44,8 +44,10 @@
44 44 module_param_array(card, int, NULL, 0444);
45 45 MODULE_PARM_DESC(card,"card type");
46 46  
47   -#define dprintk(level,fmt, arg...) if (debug >= level) \
48   - printk(KERN_DEBUG "%s/0: " fmt, dev->name , ## arg)
  47 +#define dprintk(level, fmt, arg...)\
  48 + do { if (debug >= level)\
  49 + printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
  50 + } while (0)
49 51  
50 52 static unsigned int cx23885_devcount;
51 53  
drivers/media/video/cx23885/cx23885-dvb.c
Diff comments   View file @ 4513fc6
... ... @@ -40,10 +40,12 @@
40 40 #include "tuner-xc2028.h"
41 41 #include "tuner-xc2028-types.h"
42 42  
43   -static unsigned int debug = 0;
  43 +static unsigned int debug;
44 44  
45   -#define dprintk(level,fmt, arg...) if (debug >= level) \
46   - printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg)
  45 +#define dprintk(level, fmt, arg...)\
  46 + do { if (debug >= level)\
  47 + printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
  48 + } while (0)
47 49  
48 50 /* ------------------------------------------------------------------ */
49 51  
drivers/media/video/cx23885/cx23885-i2c.c
Diff comments   View file @ 4513fc6
... ... @@ -29,7 +29,7 @@
29 29  
30 30 #include <media/v4l2-common.h>
31 31  
32   -static unsigned int i2c_debug = 0;
  32 +static unsigned int i2c_debug;
33 33 module_param(i2c_debug, int, 0644);
34 34 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
35 35  
... ... @@ -37,9 +37,9 @@
37 37 module_param(i2c_scan, int, 0444);
38 38 MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
39 39  
40   -#define dprintk(level, fmt, arg...) do { \
41   - if (i2c_debug >= level) \
42   - printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg); \
  40 +#define dprintk(level, fmt, arg...)\
  41 + do { if (i2c_debug >= level)\
  42 + printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
43 43 } while (0)
44 44  
45 45 #define I2C_WAIT_DELAY 32
drivers/media/video/cx23885/cx23885-vbi.c
Diff comments   View file @ 4513fc6
... ... @@ -31,12 +31,14 @@
31 31 module_param(vbibufs, int, 0644);
32 32 MODULE_PARM_DESC(vbibufs, "number of vbi buffers, range 2-32");
33 33  
34   -static unsigned int vbi_debug = 0;
  34 +static unsigned int vbi_debug;
35 35 module_param(vbi_debug, int, 0644);
36 36 MODULE_PARM_DESC(vbi_debug, "enable debug messages [vbi]");
37 37  
38   -#define dprintk(level, fmt, arg...) if (vbi_debug >= level) \
39   - printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg)
  38 +#define dprintk(level, fmt, arg...)\
  39 + do { if (vbi_debug >= level)\
  40 + printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
  41 + } while (0)
40 42  
41 43 /* ------------------------------------------------------------------ */
42 44  
drivers/media/video/cx23885/cx23885-video.c
Diff comments   View file @ 4513fc6
... ... @@ -57,11 +57,11 @@
57 57 MODULE_PARM_DESC(vbi_nr, "vbi device numbers");
58 58 MODULE_PARM_DESC(radio_nr, "radio device numbers");
59 59  
60   -static unsigned int video_debug = 0;
  60 +static unsigned int video_debug;
61 61 module_param(video_debug, int, 0644);
62 62 MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
63 63  
64   -static unsigned int irq_debug = 0;
  64 +static unsigned int irq_debug;
65 65 module_param(irq_debug, int, 0644);
66 66 MODULE_PARM_DESC(irq_debug, "enable debug messages [IRQ handler]");
67 67  
... ... @@ -70,8 +70,9 @@
70 70 MODULE_PARM_DESC(vid_limit, "capture memory limit in megabytes");
71 71  
72 72 #define dprintk(level, fmt, arg...)\
73   - if (video_debug >= level)\
74   - printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg)
  73 + do { if (video_debug >= level)\
  74 + printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
  75 + } while (0)
75 76  
76 77 /* ------------------------------------------------------------------- */
77 78 /* static data */