tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[media] saa7134: avoid complex macro warnings
The debug macros are not properly defined, as they generate warnings
like:
ERROR: Macros with complex values should be enclosed in parentheses
+#define core_dbg(fmt, arg...) if (core_debug) \
+ printk(KERN_DEBUG pr_fmt("core: " fmt), ## arg)
Use do { } while (0) for those macros.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+40
-20
+8
-4
drivers/media/pci/saa7134/saa7134-core.c
+8
-4
drivers/media/pci/saa7134/saa7134-core.c
···
102
102
int (*saa7134_dmasound_init)(struct saa7134_dev *dev);
103
103
int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
104
104
105
-
#define core_dbg(fmt, arg...) if (core_debug) \
106
-
printk(KERN_DEBUG pr_fmt("core: " fmt), ## arg)
105
+
#define core_dbg(fmt, arg...) do { \
106
+
if (core_debug) \
107
+
printk(KERN_DEBUG pr_fmt("core: " fmt), ## arg); \
108
+
} while (0)
107
109
108
-
#define irq_dbg(level, fmt, arg...) if (irq_debug > level) \
109
-
printk(KERN_DEBUG pr_fmt("irq: " fmt), ## arg)
110
+
#define irq_dbg(level, fmt, arg...) do {\
111
+
if (irq_debug > level) \
112
+
printk(KERN_DEBUG pr_fmt("irq: " fmt), ## arg); \
113
+
} while (0)
110
114
111
115
void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
112
116
{
+8
-4
drivers/media/pci/saa7134/saa7134-i2c.c
+8
-4
drivers/media/pci/saa7134/saa7134-i2c.c
···
41
41
module_param(i2c_scan, int, 0444);
42
42
MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
43
43
44
-
#define i2c_dbg(level, fmt, arg...) if (i2c_debug == level) \
45
-
printk(KERN_DEBUG pr_fmt("i2c: " fmt), ## arg)
44
+
#define i2c_dbg(level, fmt, arg...) do { \
45
+
if (i2c_debug == level) \
46
+
printk(KERN_DEBUG pr_fmt("i2c: " fmt), ## arg); \
47
+
} while (0)
46
48
47
-
#define i2c_cont(level, fmt, arg...) if (i2c_debug == level) \
48
-
pr_cont(fmt, ## arg)
49
+
#define i2c_cont(level, fmt, arg...) do { \
50
+
if (i2c_debug == level) \
51
+
pr_cont(fmt, ## arg); \
52
+
} while (0)
49
53
50
54
#define I2C_WAIT_DELAY 32
51
55
#define I2C_WAIT_RETRY 16
+8
-4
drivers/media/pci/saa7134/saa7134-input.c
+8
-4
drivers/media/pci/saa7134/saa7134-input.c
···
41
41
module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */
42
42
MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
43
43
44
-
#define input_dbg(fmt, arg...) if (ir_debug) \
45
-
printk(KERN_DEBUG pr_fmt("input: " fmt), ## arg)
46
-
#define ir_dbg(ir, fmt, arg...) if (ir_debug) \
47
-
printk(KERN_DEBUG pr_fmt("ir %s: " fmt), ir->name, ## arg)
44
+
#define input_dbg(fmt, arg...) do { \
45
+
if (ir_debug) \
46
+
printk(KERN_DEBUG pr_fmt("input: " fmt), ## arg); \
47
+
} while (0)
48
+
#define ir_dbg(ir, fmt, arg...) do { \
49
+
if (ir_debug) \
50
+
printk(KERN_DEBUG pr_fmt("ir %s: " fmt), ir->name, ## arg); \
51
+
} while (0)
48
52
49
53
/* Helper function for raw decoding at GPIO16 or GPIO18 */
50
54
static int saa7134_raw_decode_irq(struct saa7134_dev *dev);
+4
-2
drivers/media/pci/saa7134/saa7134-ts.c
+4
-2
drivers/media/pci/saa7134/saa7134-ts.c
···
35
35
module_param(ts_debug, int, 0644);
36
36
MODULE_PARM_DESC(ts_debug,"enable debug messages [ts]");
37
37
38
-
#define ts_dbg(fmt, arg...) if (ts_debug) \
39
-
printk(KERN_DEBUG pr_fmt("ts: " fmt), ## arg)
38
+
#define ts_dbg(fmt, arg...) do { \
39
+
if (ts_debug) \
40
+
printk(KERN_DEBUG pr_fmt("ts: " fmt), ## arg); \
41
+
} while (0)
40
42
41
43
/* ------------------------------------------------------------------ */
42
44
static int buffer_activate(struct saa7134_dev *dev,
+4
-2
drivers/media/pci/saa7134/saa7134-tvaudio.c
+4
-2
drivers/media/pci/saa7134/saa7134-tvaudio.c
···
49
49
module_param(audio_clock_tweak, int, 0644);
50
50
MODULE_PARM_DESC(audio_clock_tweak, "Audio clock tick fine tuning for cards with audio crystal that's slightly off (range [-1024 .. 1024])");
51
51
52
-
#define audio_dbg(level, fmt, arg...) if (audio_debug >= level) \
53
-
printk(KERN_DEBUG pr_fmt("audio: " fmt), ## arg)
52
+
#define audio_dbg(level, fmt, arg...) do { \
53
+
if (audio_debug >= level) \
54
+
printk(KERN_DEBUG pr_fmt("audio: " fmt), ## arg); \
55
+
} while (0)
54
56
55
57
/* msecs */
56
58
#define SCAN_INITIAL_DELAY 1000
+4
-2
drivers/media/pci/saa7134/saa7134-vbi.c
+4
-2
drivers/media/pci/saa7134/saa7134-vbi.c
···
38
38
module_param(vbibufs, int, 0444);
39
39
MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32");
40
40
41
-
#define vbi_dbg(fmt, arg...) if (vbi_debug) \
42
-
printk(KERN_DEBUG pr_fmt("vbi: " fmt), ## arg)
41
+
#define vbi_dbg(fmt, arg...) do { \
42
+
if (vbi_debug) \
43
+
printk(KERN_DEBUG pr_fmt("vbi: " fmt), ## arg); \
44
+
} while (0)
43
45
44
46
/* ------------------------------------------------------------------ */
45
47
+4
-2
drivers/media/pci/saa7134/saa7134-video.c
+4
-2
drivers/media/pci/saa7134/saa7134-video.c
···
52
52
MODULE_PARM_DESC(secam, "force SECAM variant, either DK,L or Lc");
53
53
54
54
55
-
#define video_dbg(fmt, arg...) if (video_debug & 0x04) \
56
-
printk(KERN_DEBUG pr_fmt("video: " fmt), ## arg)
55
+
#define video_dbg(fmt, arg...) do { \
56
+
if (video_debug & 0x04) \
57
+
printk(KERN_DEBUG pr_fmt("video: " fmt), ## arg); \
58
+
} while (0)
57
59
58
60
/* ------------------------------------------------------------------ */
59
61
/* Defines for Video Output Port Register at address 0x191 */