diff options
author | Steven Toth <stoth@hauppauge.com> | 2008-01-12 09:36:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:04:51 -0500 |
commit | 4513fc696e273d64ea32f2366748aed810316ecc (patch) | |
tree | 567d831ce0518f44d48cfcadebce86781266563b | |
parent | d685a483b8c92e3d0580b6c28e2ed531391c8c46 (diff) |
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>
-rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 8 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 8 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-i2c.c | 8 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-vbi.c | 8 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 9 |
5 files changed, 24 insertions, 17 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index e1b06d79e9b1..8e40c7bcc06d 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c | |||
@@ -36,7 +36,7 @@ MODULE_DESCRIPTION("Driver for cx23885 based TV cards"); | |||
36 | MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>"); | 36 | MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>"); |
37 | MODULE_LICENSE("GPL"); | 37 | MODULE_LICENSE("GPL"); |
38 | 38 | ||
39 | static unsigned int debug = 0; | 39 | static unsigned int debug; |
40 | module_param(debug,int,0644); | 40 | module_param(debug,int,0644); |
41 | MODULE_PARM_DESC(debug,"enable debug messages"); | 41 | MODULE_PARM_DESC(debug,"enable debug messages"); |
42 | 42 | ||
@@ -44,8 +44,10 @@ static unsigned int card[] = {[0 ... (CX23885_MAXBOARDS - 1)] = UNSET }; | |||
44 | module_param_array(card, int, NULL, 0444); | 44 | module_param_array(card, int, NULL, 0444); |
45 | MODULE_PARM_DESC(card,"card type"); | 45 | MODULE_PARM_DESC(card,"card type"); |
46 | 46 | ||
47 | #define dprintk(level,fmt, arg...) if (debug >= level) \ | 47 | #define dprintk(level, fmt, arg...)\ |
48 | printk(KERN_DEBUG "%s/0: " fmt, dev->name , ## arg) | 48 | do { if (debug >= level)\ |
49 | printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\ | ||
50 | } while (0) | ||
49 | 51 | ||
50 | static unsigned int cx23885_devcount; | 52 | static unsigned int cx23885_devcount; |
51 | 53 | ||
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 1b669ee962d0..34910368049e 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -40,10 +40,12 @@ | |||
40 | #include "tuner-xc2028.h" | 40 | #include "tuner-xc2028.h" |
41 | #include "tuner-xc2028-types.h" | 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) \ | 45 | #define dprintk(level, fmt, arg...)\ |
46 | printk(KERN_DEBUG "%s: " fmt, dev->name, ## 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 | ||
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c index fbc4a57a236b..92fe0bd37c84 100644 --- a/drivers/media/video/cx23885/cx23885-i2c.c +++ b/drivers/media/video/cx23885/cx23885-i2c.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include <media/v4l2-common.h> | 30 | #include <media/v4l2-common.h> |
31 | 31 | ||
32 | static unsigned int i2c_debug = 0; | 32 | static unsigned int i2c_debug; |
33 | module_param(i2c_debug, int, 0644); | 33 | module_param(i2c_debug, int, 0644); |
34 | MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); | 34 | MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); |
35 | 35 | ||
@@ -37,9 +37,9 @@ static unsigned int i2c_scan = 0; | |||
37 | module_param(i2c_scan, int, 0444); | 37 | module_param(i2c_scan, int, 0444); |
38 | MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); | 38 | MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); |
39 | 39 | ||
40 | #define dprintk(level, fmt, arg...) do { \ | 40 | #define dprintk(level, fmt, arg...)\ |
41 | if (i2c_debug >= level) \ | 41 | do { if (i2c_debug >= level)\ |
42 | printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg); \ | 42 | printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\ |
43 | } while (0) | 43 | } while (0) |
44 | 44 | ||
45 | #define I2C_WAIT_DELAY 32 | 45 | #define I2C_WAIT_DELAY 32 |
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c index 32ec9d5bdbd0..e36e3fcae2fb 100644 --- a/drivers/media/video/cx23885/cx23885-vbi.c +++ b/drivers/media/video/cx23885/cx23885-vbi.c | |||
@@ -31,12 +31,14 @@ static unsigned int vbibufs = 4; | |||
31 | module_param(vbibufs, int, 0644); | 31 | module_param(vbibufs, int, 0644); |
32 | MODULE_PARM_DESC(vbibufs, "number of vbi buffers, range 2-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 | module_param(vbi_debug, int, 0644); | 35 | module_param(vbi_debug, int, 0644); |
36 | MODULE_PARM_DESC(vbi_debug, "enable debug messages [vbi]"); | 36 | MODULE_PARM_DESC(vbi_debug, "enable debug messages [vbi]"); |
37 | 37 | ||
38 | #define dprintk(level, fmt, arg...) if (vbi_debug >= level) \ | 38 | #define dprintk(level, fmt, arg...)\ |
39 | printk(KERN_DEBUG "%s: " fmt, dev->name , ## 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 | ||
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 44c809474ba1..d3c4d2c5cbe0 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -57,11 +57,11 @@ MODULE_PARM_DESC(video_nr, "video device numbers"); | |||
57 | MODULE_PARM_DESC(vbi_nr, "vbi device numbers"); | 57 | MODULE_PARM_DESC(vbi_nr, "vbi device numbers"); |
58 | MODULE_PARM_DESC(radio_nr, "radio device numbers"); | 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 | module_param(video_debug, int, 0644); | 61 | module_param(video_debug, int, 0644); |
62 | MODULE_PARM_DESC(video_debug, "enable debug messages [video]"); | 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 | module_param(irq_debug, int, 0644); | 65 | module_param(irq_debug, int, 0644); |
66 | MODULE_PARM_DESC(irq_debug, "enable debug messages [IRQ handler]"); | 66 | MODULE_PARM_DESC(irq_debug, "enable debug messages [IRQ handler]"); |
67 | 67 | ||
@@ -70,8 +70,9 @@ module_param(vid_limit, int, 0644); | |||
70 | MODULE_PARM_DESC(vid_limit, "capture memory limit in megabytes"); | 70 | MODULE_PARM_DESC(vid_limit, "capture memory limit in megabytes"); |
71 | 71 | ||
72 | #define dprintk(level, fmt, arg...)\ | 72 | #define dprintk(level, fmt, arg...)\ |
73 | if (video_debug >= level)\ | 73 | do { if (video_debug >= level)\ |
74 | printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg) | 74 | printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\ |
75 | } while (0) | ||
75 | 76 | ||
76 | /* ------------------------------------------------------------------- */ | 77 | /* ------------------------------------------------------------------- */ |
77 | /* static data */ | 78 | /* static data */ |