aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/ir-functions.c2
-rw-r--r--drivers/media/dvb/b2c2/flexcop-pci.c2
-rw-r--r--drivers/media/dvb/dvb-core/dvb_net.c2
-rw-r--r--drivers/media/dvb/frontends/cx22702.c2
-rw-r--r--drivers/media/dvb/frontends/dvb-pll.c2
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.c2
-rw-r--r--drivers/media/dvb/frontends/nxt6000.c2
-rw-r--r--drivers/media/dvb/frontends/s5h1409.c2
-rw-r--r--drivers/media/dvb/frontends/s5h1420.c2
-rw-r--r--drivers/media/dvb/frontends/sp8870.c12
-rw-r--r--drivers/media/dvb/frontends/tda10086.c2
-rw-r--r--drivers/media/dvb/frontends/tda826x.c2
-rw-r--r--drivers/media/dvb/frontends/tda827x.c2
-rw-r--r--drivers/media/dvb/frontends/ves1x93.c2
-rw-r--r--drivers/media/dvb/frontends/zl10353.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c2
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c2
-rw-r--r--drivers/media/radio/miropcm20-rds.c2
-rw-r--r--drivers/media/radio/radio-cadet.c10
-rw-r--r--drivers/media/radio/radio-typhoon.c2
-rw-r--r--drivers/media/video/adv7170.c2
-rw-r--r--drivers/media/video/adv7175.c2
-rw-r--r--drivers/media/video/arv.c4
-rw-r--r--drivers/media/video/bt819.c2
-rw-r--r--drivers/media/video/bt856.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-vbi.c2
-rw-r--r--drivers/media/video/bw-qcam.c4
-rw-r--r--drivers/media/video/c-qcam.c4
-rw-r--r--drivers/media/video/cafe_ccic.c4
-rw-r--r--drivers/media/video/cpia2/cpia2_core.c4
-rw-r--r--drivers/media/video/cpia2/cpia2_usb.c2
-rw-r--r--drivers/media/video/cx23885/cx23885-i2c.c2
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
-rw-r--r--drivers/media/video/cx88/cx88-core.c6
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c2
-rw-r--r--drivers/media/video/cx88/cx88-i2c.c4
-rw-r--r--drivers/media/video/cx88/cx88-input.c2
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c2
-rw-r--r--drivers/media/video/cx88/cx88-tvaudio.c6
-rw-r--r--drivers/media/video/cx88/cx88-vbi.c2
-rw-r--r--drivers/media/video/cx88/cx88-video.c4
-rw-r--r--drivers/media/video/dpc7146.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c6
-rw-r--r--drivers/media/video/em28xx/em28xx-i2c.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--drivers/media/video/et61x251/et61x251_core.c2
-rw-r--r--drivers/media/video/hexium_gemini.c4
-rw-r--r--drivers/media/video/hexium_orion.c4
-rw-r--r--drivers/media/video/ir-kbd-i2c.c2
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c6
-rw-r--r--drivers/media/video/meye.c2
-rw-r--r--drivers/media/video/mt20xx.c4
-rw-r--r--drivers/media/video/mxb.c4
-rw-r--r--drivers/media/video/pms.c4
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.c6
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-i2c-core.c2
-rw-r--r--drivers/media/video/pwc/pwc-if.c8
-rw-r--r--drivers/media/video/saa6588.c8
-rw-r--r--drivers/media/video/saa7110.c2
-rw-r--r--drivers/media/video/saa7111.c2
-rw-r--r--drivers/media/video/saa7114.c2
-rw-r--r--drivers/media/video/saa7115.c2
-rw-r--r--drivers/media/video/saa711x.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c10
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c6
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-i2c.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c6
-rw-r--r--drivers/media/video/saa7134/saa7134-ts.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-tvaudio.c6
-rw-r--r--drivers/media/video/saa7134/saa7134-vbi.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c2
-rw-r--r--drivers/media/video/saa7185.c2
-rw-r--r--drivers/media/video/se401.c2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c2
-rw-r--r--drivers/media/video/stradis.c4
-rw-r--r--drivers/media/video/stv680.c9
-rw-r--r--drivers/media/video/tda9840.c2
-rw-r--r--drivers/media/video/tea5761.c2
-rw-r--r--drivers/media/video/tea5767.c2
-rw-r--r--drivers/media/video/tea6415c.c2
-rw-r--r--drivers/media/video/tea6420.c2
-rw-r--r--drivers/media/video/tuner-core.c6
-rw-r--r--drivers/media/video/tvaudio.c8
-rw-r--r--drivers/media/video/tvp5150.c2
-rw-r--r--drivers/media/video/usbvideo/ibmcam.c2
-rw-r--r--drivers/media/video/usbvideo/konicawc.c2
-rw-r--r--drivers/media/video/usbvideo/quickcam_messenger.c2
-rw-r--r--drivers/media/video/usbvideo/ultracam.c4
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c2
-rw-r--r--drivers/media/video/usbvision/usbvision-core.c14
-rw-r--r--drivers/media/video/usbvision/usbvision-i2c.c2
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c4
-rw-r--r--drivers/media/video/v4l1-compat.c2
-rw-r--r--drivers/media/video/videobuf-dma-sg.c2
-rw-r--r--drivers/media/video/videobuf-dvb.c2
-rw-r--r--drivers/media/video/videobuf-vmalloc.c2
-rw-r--r--drivers/media/video/videocodec.c4
-rw-r--r--drivers/media/video/vino.c10
-rw-r--r--drivers/media/video/vpx3220.c2
-rw-r--r--drivers/media/video/w9966.c4
-rw-r--r--drivers/media/video/w9968cf.c2
-rw-r--r--drivers/media/video/zc0301/zc0301_core.c2
-rw-r--r--drivers/media/video/zoran_card.c6
-rw-r--r--drivers/media/video/zoran_device.c5
-rw-r--r--drivers/media/video/zoran_driver.c2
-rw-r--r--drivers/media/video/zr36016.c5
-rw-r--r--drivers/media/video/zr36050.c5
-rw-r--r--drivers/media/video/zr36060.c6
-rw-r--r--drivers/media/video/zr364xx.c4
111 files changed, 196 insertions, 192 deletions
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index bb2a027b9483..266505207925 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -34,7 +34,7 @@ static int repeat = 1;
34module_param(repeat, int, 0444); 34module_param(repeat, int, 0444);
35MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)"); 35MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)");
36 36
37static int debug = 0; /* debug level (0,1,2) */ 37static int debug; /* debug level (0,1,2) */
38module_param(debug, int, 0644); 38module_param(debug, int, 0644);
39 39
40#define dprintk(level, fmt, arg...) if (debug >= level) \ 40#define dprintk(level, fmt, arg...) if (debug >= level) \
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index 01af4d237eb1..5b30dfc7846b 100644
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -32,7 +32,7 @@ MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ watchdog (currently jus
32#define deb_irq(args...) dprintk(0x08,args) 32#define deb_irq(args...) dprintk(0x08,args)
33#define deb_chk(args...) dprintk(0x10,args) 33#define deb_chk(args...) dprintk(0x10,args)
34 34
35static int debug = 0; 35static int debug;
36module_param(debug, int, 0644); 36module_param(debug, int, 0644);
37MODULE_PARM_DESC(debug, "set debug level (1=info,2=regs,4=TS,8=irqdma (|-able))." DEBSTATUS); 37MODULE_PARM_DESC(debug, "set debug level (1=info,2=regs,4=TS,8=irqdma (|-able))." DEBSTATUS);
38 38
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index 4c8b62e2c035..efaa297ac34d 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -354,7 +354,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
354#ifdef ULE_DEBUG 354#ifdef ULE_DEBUG
355 /* The code inside ULE_DEBUG keeps a history of the last 100 TS cells processed. */ 355 /* The code inside ULE_DEBUG keeps a history of the last 100 TS cells processed. */
356 static unsigned char ule_hist[100*TS_SZ]; 356 static unsigned char ule_hist[100*TS_SZ];
357 static unsigned char *ule_where = ule_hist, ule_dump = 0; 357 static unsigned char *ule_where = ule_hist, ule_dump;
358#endif 358#endif
359 359
360 /* For all TS cells in current buffer. 360 /* For all TS cells in current buffer.
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 1dc164d5488c..406c4cfa82bb 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -48,7 +48,7 @@ struct cx22702_state {
48 u8 prevUCBlocks; 48 u8 prevUCBlocks;
49}; 49};
50 50
51static int debug = 0; 51static int debug;
52#define dprintk if (debug) printk 52#define dprintk if (debug) printk
53 53
54/* Register values to initialise the demod */ 54/* Register values to initialise the demod */
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 8c8d7342d0b3..decf798994e9 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -44,7 +44,7 @@ struct dvb_pll_priv {
44 44
45static unsigned int dvb_pll_devcount; 45static unsigned int dvb_pll_devcount;
46 46
47static int debug = 0; 47static int debug;
48module_param(debug, int, 0644); 48module_param(debug, int, 0644);
49MODULE_PARM_DESC(debug, "enable verbose debug messages"); 49MODULE_PARM_DESC(debug, "enable verbose debug messages");
50 50
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index bdc9fa88b86a..dc897a3903fc 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -49,7 +49,7 @@
49/* Use Equalizer Mean Squared Error instead of Phaser Tracker MSE */ 49/* Use Equalizer Mean Squared Error instead of Phaser Tracker MSE */
50/* #define USE_EQMSE */ 50/* #define USE_EQMSE */
51 51
52static int debug = 0; 52static int debug;
53module_param(debug, int, 0644); 53module_param(debug, int, 0644);
54MODULE_PARM_DESC(debug,"Turn on/off lgdt330x frontend debugging (default:off)."); 54MODULE_PARM_DESC(debug,"Turn on/off lgdt330x frontend debugging (default:off).");
55#define dprintk(args...) \ 55#define dprintk(args...) \
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index d313d7dcf386..0eef22dbf8a0 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -38,7 +38,7 @@ struct nxt6000_state {
38 struct dvb_frontend frontend; 38 struct dvb_frontend frontend;
39}; 39};
40 40
41static int debug = 0; 41static int debug;
42#define dprintk if (debug) printk 42#define dprintk if (debug) printk
43 43
44static int nxt6000_writereg(struct nxt6000_state* state, u8 reg, u8 data) 44static int nxt6000_writereg(struct nxt6000_state* state, u8 reg, u8 data)
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 1a4d8319773c..1ca250378664 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -48,7 +48,7 @@ struct s5h1409_state {
48 u32 qam_state; 48 u32 qam_state;
49}; 49};
50 50
51static int debug = 0; 51static int debug;
52#define dprintk if (debug) printk 52#define dprintk if (debug) printk
53 53
54/* Register values to initialise the demod, this will set VSB by default */ 54/* Register values to initialise the demod, this will set VSB by default */
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 2c2c344c4c64..7c64af91e5ac 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -53,7 +53,7 @@ static int s5h1420_get_tune_settings(struct dvb_frontend* fe,
53 struct dvb_frontend_tune_settings* fesettings); 53 struct dvb_frontend_tune_settings* fesettings);
54 54
55 55
56static int debug = 0; 56static int debug;
57#define dprintk if (debug) printk 57#define dprintk if (debug) printk
58 58
59static int s5h1420_writereg (struct s5h1420_state* state, u8 reg, u8 data) 59static int s5h1420_writereg (struct s5h1420_state* state, u8 reg, u8 data)
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index da876f7bfe32..f5b3bfc00436 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -449,15 +449,15 @@ static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks
449 return 0; 449 return 0;
450} 450}
451 451
452// number of trials to recover from lockup 452/* number of trials to recover from lockup */
453#define MAXTRIALS 5 453#define MAXTRIALS 5
454// maximum checks for data valid signal 454/* maximum checks for data valid signal */
455#define MAXCHECKS 100 455#define MAXCHECKS 100
456 456
457// only for debugging: counter for detected lockups 457/* only for debugging: counter for detected lockups */
458static int lockups = 0; 458static int lockups;
459// only for debugging: counter for channel switches 459/* only for debugging: counter for channel switches */
460static int switches = 0; 460static int switches;
461 461
462static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p) 462static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
463{ 463{
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c
index 0d2b69a99ad4..143af96439b9 100644
--- a/drivers/media/dvb/frontends/tda10086.c
+++ b/drivers/media/dvb/frontends/tda10086.c
@@ -43,7 +43,7 @@ struct tda10086_state {
43 bool has_lock; 43 bool has_lock;
44}; 44};
45 45
46static int debug = 0; 46static int debug;
47#define dprintk(args...) \ 47#define dprintk(args...) \
48 do { \ 48 do { \
49 if (debug) printk(KERN_DEBUG "tda10086: " args); \ 49 if (debug) printk(KERN_DEBUG "tda10086: " args); \
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c
index bd3ebc284835..9a91eb0333d9 100644
--- a/drivers/media/dvb/frontends/tda826x.c
+++ b/drivers/media/dvb/frontends/tda826x.c
@@ -26,7 +26,7 @@
26 26
27#include "tda826x.h" 27#include "tda826x.h"
28 28
29static int debug = 0; 29static int debug;
30#define dprintk(args...) \ 30#define dprintk(args...) \
31 do { \ 31 do { \
32 if (debug) printk(KERN_DEBUG "tda826x: " args); \ 32 if (debug) printk(KERN_DEBUG "tda826x: " args); \
diff --git a/drivers/media/dvb/frontends/tda827x.c b/drivers/media/dvb/frontends/tda827x.c
index 229b11987a58..3190c8d0c17c 100644
--- a/drivers/media/dvb/frontends/tda827x.c
+++ b/drivers/media/dvb/frontends/tda827x.c
@@ -25,7 +25,7 @@
25 25
26#include "tda827x.h" 26#include "tda827x.h"
27 27
28static int debug = 0; 28static int debug;
29module_param(debug, int, 0644); 29module_param(debug, int, 0644);
30MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); 30MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
31 31
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index 23fd0303c91b..c041c81f9686 100644
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -48,7 +48,7 @@ struct ves1x93_state {
48 u8 demod_type; 48 u8 demod_type;
49}; 49};
50 50
51static int debug = 0; 51static int debug;
52#define dprintk if (debug) printk 52#define dprintk if (debug) printk
53 53
54#define DEMOD_VES1893 0 54#define DEMOD_VES1893 0
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 276e3b631dc2..3d508ff4b292 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -46,7 +46,7 @@ static int debug;
46 if (debug) printk(KERN_DEBUG "zl10353: " args); \ 46 if (debug) printk(KERN_DEBUG "zl10353: " args); \
47 } while (0) 47 } while (0)
48 48
49static int debug_regs = 0; 49static int debug_regs;
50 50
51static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val) 51static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
52{ 52{
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 509349211d4f..0f476f75e03d 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -86,7 +86,7 @@ static int rc5_device = -1;
86module_param(rc5_device, int, 0644); 86module_param(rc5_device, int, 0644);
87MODULE_PARM_DESC(rc5_device, "only IR commands to given RC5 device (device = 0 - 31, any device = 255, default: autodetect)"); 87MODULE_PARM_DESC(rc5_device, "only IR commands to given RC5 device (device = 0 - 31, any device = 255, default: autodetect)");
88 88
89static int ir_debug = 0; 89static int ir_debug;
90module_param(ir_debug, int, 0644); 90module_param(ir_debug, int, 0644);
91MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding"); 91MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
92 92
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 7902ae1d9a18..ab39f9694e74 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -542,7 +542,7 @@ static void ttusb_handle_sec_data(struct ttusb_channel *channel,
542 const u8 * data, int len); 542 const u8 * data, int len);
543#endif 543#endif
544 544
545static int numpkt = 0, numts, numstuff, numsec, numinvalid; 545static int numpkt, numts, numstuff, numsec, numinvalid;
546static unsigned long lastj; 546static unsigned long lastj;
547 547
548static void ttusb_process_muxpack(struct ttusb *ttusb, const u8 * muxpack, 548static void ttusb_process_muxpack(struct ttusb *ttusb, const u8 * muxpack,
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index aed11477378b..06dfed9ef4c7 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -19,7 +19,7 @@
19#include "miropcm20-rds-core.h" 19#include "miropcm20-rds-core.h"
20 20
21static char * text_buffer; 21static char * text_buffer;
22static int rds_users = 0; 22static int rds_users;
23 23
24 24
25static int rds_f_open(struct inode *in, struct file *fi) 25static int rds_f_open(struct inode *in, struct file *fi)
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 57b9e3adc8f0..265c4ea95502 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -69,13 +69,13 @@ static struct v4l2_queryctrl radio_qctrl[] = {
69 69
70static int io=-1; /* default to isapnp activation */ 70static int io=-1; /* default to isapnp activation */
71static int radio_nr = -1; 71static int radio_nr = -1;
72static int users=0; 72static int users;
73static int curtuner=0; 73static int curtuner;
74static int tunestat=0; 74static int tunestat;
75static int sigstrength=0; 75static int sigstrength;
76static wait_queue_head_t read_queue; 76static wait_queue_head_t read_queue;
77static struct timer_list readtimer; 77static struct timer_list readtimer;
78static __u8 rdsin=0,rdsout=0,rdsstat=0; 78static __u8 rdsin, rdsout, rdsstat;
79static unsigned char rdsbuf[RDS_BUFFER]; 79static unsigned char rdsbuf[RDS_BUFFER];
80static spinlock_t cadet_io_lock; 80static spinlock_t cadet_io_lock;
81 81
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 1366326474e5..02e3a2f05eee 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -404,7 +404,7 @@ MODULE_PARM_DESC(io, "I/O address of the Typhoon card (0x316 or 0x336)");
404module_param(radio_nr, int, 0); 404module_param(radio_nr, int, 0);
405 405
406#ifdef MODULE 406#ifdef MODULE
407static unsigned long mutefreq = 0; 407static unsigned long mutefreq;
408module_param(mutefreq, ulong, 0); 408module_param(mutefreq, ulong, 0);
409MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)"); 409MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)");
410#endif 410#endif
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index fea2e723e34b..f794f2dbfb32 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -56,7 +56,7 @@ MODULE_LICENSE("GPL");
56#define I2C_NAME(x) (x)->name 56#define I2C_NAME(x) (x)->name
57 57
58 58
59static int debug = 0; 59static int debug;
60module_param(debug, int, 0); 60module_param(debug, int, 0);
61MODULE_PARM_DESC(debug, "Debug level (0-1)"); 61MODULE_PARM_DESC(debug, "Debug level (0-1)");
62 62
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 10d4d89623f1..8ee07a68f702 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
52#define I2C_NAME(s) (s)->name 52#define I2C_NAME(s) (s)->name
53 53
54 54
55static int debug = 0; 55static int debug;
56module_param(debug, int, 0); 56module_param(debug, int, 0);
57MODULE_PARM_DESC(debug, "Debug level (0-1)"); 57MODULE_PARM_DESC(debug, "Debug level (0-1)");
58 58
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index c94a4d0f2804..e4d891b29f63 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -125,8 +125,8 @@ static unsigned char yuv[MAX_AR_FRAME_BYTES];
125/* default frequency */ 125/* default frequency */
126#define DEFAULT_FREQ 50 /* 50 or 75 (MHz) is available as BCLK */ 126#define DEFAULT_FREQ 50 /* 50 or 75 (MHz) is available as BCLK */
127static int freq = DEFAULT_FREQ; /* BCLK: available 50 or 70 (MHz) */ 127static int freq = DEFAULT_FREQ; /* BCLK: available 50 or 70 (MHz) */
128static int vga = 0; /* default mode(0:QVGA mode, other:VGA mode) */ 128static int vga; /* default mode(0:QVGA mode, other:VGA mode) */
129static int vga_interlace = 0; /* 0 is normal mode for, else interlace mode */ 129static int vga_interlace; /* 0 is normal mode for, else interlace mode */
130module_param(freq, int, 0); 130module_param(freq, int, 0);
131module_param(vga, int, 0); 131module_param(vga, int, 0);
132module_param(vga_interlace, int, 0); 132module_param(vga_interlace, int, 0);
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index e663cc045c41..8bfd5c75cb3a 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -57,7 +57,7 @@ MODULE_LICENSE("GPL");
57#define I2C_NAME(s) (s)->name 57#define I2C_NAME(s) (s)->name
58 58
59 59
60static int debug = 0; 60static int debug;
61module_param(debug, int, 0); 61module_param(debug, int, 0);
62MODULE_PARM_DESC(debug, "Debug level (0-1)"); 62MODULE_PARM_DESC(debug, "Debug level (0-1)");
63 63
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 7dee2e3235ad..98ee2d8feb34 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -56,7 +56,7 @@ MODULE_LICENSE("GPL");
56#define I2C_NAME(s) (s)->name 56#define I2C_NAME(s) (s)->name
57 57
58 58
59static int debug = 0; 59static int debug;
60module_param(debug, int, 0); 60module_param(debug, int, 0);
61MODULE_PARM_DESC(debug, "Debug level (0-1)"); 61MODULE_PARM_DESC(debug, "Debug level (0-1)");
62 62
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 75fa82c7c735..bfdbc469e30f 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -54,7 +54,7 @@
54#define VBI_DEFLINES 16 54#define VBI_DEFLINES 16
55 55
56static unsigned int vbibufs = 4; 56static unsigned int vbibufs = 4;
57static unsigned int vbi_debug = 0; 57static unsigned int vbi_debug;
58 58
59module_param(vbibufs, int, 0444); 59module_param(vbibufs, int, 0444);
60module_param(vbi_debug, int, 0644); 60module_param(vbi_debug, int, 0644);
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 032265383df2..40a8e92a01b9 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -523,7 +523,7 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[])
523 int ret=1; 523 int ret=1;
524 unsigned int hi, lo; 524 unsigned int hi, lo;
525 unsigned int hi2, lo2; 525 unsigned int hi2, lo2;
526 static int state = 0; 526 static int state;
527 527
528 if (buffer == NULL) 528 if (buffer == NULL)
529 { 529 {
@@ -912,7 +912,7 @@ static struct video_device qcam_template=
912 912
913#define MAX_CAMS 4 913#define MAX_CAMS 4
914static struct qcam_device *qcams[MAX_CAMS]; 914static struct qcam_device *qcams[MAX_CAMS];
915static unsigned int num_cams = 0; 915static unsigned int num_cams;
916 916
917static int init_bwqcam(struct parport *port) 917static int init_bwqcam(struct parport *port)
918{ 918{
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index cf1546b5a7f1..d4d5adfb0351 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -69,7 +69,7 @@ struct qcam_device {
69 69
70static int parport[MAX_CAMS] = { [1 ... MAX_CAMS-1] = -1 }; 70static int parport[MAX_CAMS] = { [1 ... MAX_CAMS-1] = -1 };
71static int probe = 2; 71static int probe = 2;
72static int force_rgb = 0; 72static int force_rgb;
73static int video_nr = -1; 73static int video_nr = -1;
74 74
75static inline void qcam_set_ack(struct qcam_device *qcam, unsigned int i) 75static inline void qcam_set_ack(struct qcam_device *qcam, unsigned int i)
@@ -741,7 +741,7 @@ static struct qcam_device *qcam_init(struct parport *port)
741} 741}
742 742
743static struct qcam_device *qcams[MAX_CAMS]; 743static struct qcam_device *qcams[MAX_CAMS];
744static unsigned int num_cams = 0; 744static unsigned int num_cams;
745 745
746static int init_cqcam(struct parport *port) 746static int init_cqcam(struct parport *port)
747{ 747{
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 7ae499c9c54c..5195b1f3378a 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -65,7 +65,7 @@ MODULE_SUPPORTED_DEVICE("Video");
65 */ 65 */
66 66
67#define MAX_DMA_BUFS 3 67#define MAX_DMA_BUFS 3
68static int alloc_bufs_at_read = 0; 68static int alloc_bufs_at_read;
69module_param(alloc_bufs_at_read, bool, 0444); 69module_param(alloc_bufs_at_read, bool, 0444);
70MODULE_PARM_DESC(alloc_bufs_at_read, 70MODULE_PARM_DESC(alloc_bufs_at_read,
71 "Non-zero value causes DMA buffers to be allocated when the " 71 "Non-zero value causes DMA buffers to be allocated when the "
@@ -99,7 +99,7 @@ MODULE_PARM_DESC(max_buffers,
99 "will be allowed to allocate. These buffers are big and live " 99 "will be allowed to allocate. These buffers are big and live "
100 "in vmalloc space."); 100 "in vmalloc space.");
101 101
102static int flip = 0; 102static int flip;
103module_param(flip, bool, 0444); 103module_param(flip, bool, 0444);
104MODULE_PARM_DESC(flip, 104MODULE_PARM_DESC(flip,
105 "If set, the sensor will be instructed to flip the image " 105 "If set, the sensor will be instructed to flip the image "
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index a76bd786cf13..a439a56c3cc9 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -34,7 +34,7 @@
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/vmalloc.h> 35#include <linux/vmalloc.h>
36 36
37//#define _CPIA2_DEBUG_ 37/* #define _CPIA2_DEBUG_ */
38 38
39#include "cpia2patch.h" 39#include "cpia2patch.h"
40 40
@@ -48,7 +48,7 @@ static const char *block_name[] = {
48}; 48};
49#endif 49#endif
50 50
51static unsigned int debugs_on = 0;//DEBUG_REG; 51static unsigned int debugs_on; /* default 0 - DEBUG_REG */
52 52
53 53
54/****************************************************************************** 54/******************************************************************************
diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c
index d8e929863a88..a4574740350d 100644
--- a/drivers/media/video/cpia2/cpia2_usb.c
+++ b/drivers/media/video/cpia2/cpia2_usb.c
@@ -84,7 +84,7 @@ static struct usb_driver cpia2_driver = {
84 *****************************************************************************/ 84 *****************************************************************************/
85static void process_frame(struct camera_data *cam) 85static void process_frame(struct camera_data *cam)
86{ 86{
87 static int frame_count = 0; 87 static int frame_count;
88 88
89 unsigned char *inbuff = cam->workbuff->data; 89 unsigned char *inbuff = cam->workbuff->data;
90 90
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 92fe0bd37c84..748c79a46549 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -33,7 +33,7 @@ static unsigned int i2c_debug;
33module_param(i2c_debug, int, 0644); 33module_param(i2c_debug, int, 0644);
34MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); 34MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
35 35
36static unsigned int i2c_scan = 0; 36static unsigned int i2c_scan;
37module_param(i2c_scan, int, 0444); 37module_param(i2c_scan, int, 0444);
38MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); 38MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
39 39
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index a99e9d5950aa..c37269074524 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -45,7 +45,7 @@ static unsigned int mpegbufs = 32;
45module_param(mpegbufs,int,0644); 45module_param(mpegbufs,int,0644);
46MODULE_PARM_DESC(mpegbufs,"number of mpeg buffers, range 2-32"); 46MODULE_PARM_DESC(mpegbufs,"number of mpeg buffers, range 2-32");
47 47
48static unsigned int debug = 0; 48static unsigned int debug;
49module_param(debug,int,0644); 49module_param(debug,int,0644);
50MODULE_PARM_DESC(debug,"enable debug messages [blackbird]"); 50MODULE_PARM_DESC(debug,"enable debug messages [blackbird]");
51 51
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 01e2ac98970b..12440b91e4b3 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -47,15 +47,15 @@ MODULE_LICENSE("GPL");
47 47
48/* ------------------------------------------------------------------ */ 48/* ------------------------------------------------------------------ */
49 49
50static unsigned int core_debug = 0; 50static unsigned int core_debug;
51module_param(core_debug,int,0644); 51module_param(core_debug,int,0644);
52MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); 52MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
53 53
54static unsigned int nicam = 0; 54static unsigned int nicam;
55module_param(nicam,int,0644); 55module_param(nicam,int,0644);
56MODULE_PARM_DESC(nicam,"tv audio is nicam"); 56MODULE_PARM_DESC(nicam,"tv audio is nicam");
57 57
58static unsigned int nocomb = 0; 58static unsigned int nocomb;
59module_param(nocomb,int,0644); 59module_param(nocomb,int,0644);
60MODULE_PARM_DESC(nocomb,"disable comb filter"); 60MODULE_PARM_DESC(nocomb,"disable comb filter");
61 61
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index f7b41eb1bb5a..7586fe31f643 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -51,7 +51,7 @@ MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
51MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 51MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
52MODULE_LICENSE("GPL"); 52MODULE_LICENSE("GPL");
53 53
54static unsigned int debug = 0; 54static unsigned int debug;
55module_param(debug, int, 0644); 55module_param(debug, int, 0644);
56MODULE_PARM_DESC(debug,"enable debug messages [dvb]"); 56MODULE_PARM_DESC(debug,"enable debug messages [dvb]");
57 57
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 566b26af523e..c6b44732a082 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -35,11 +35,11 @@
35#include "cx88.h" 35#include "cx88.h"
36#include <media/v4l2-common.h> 36#include <media/v4l2-common.h>
37 37
38static unsigned int i2c_debug = 0; 38static unsigned int i2c_debug;
39module_param(i2c_debug, int, 0644); 39module_param(i2c_debug, int, 0644);
40MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); 40MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]");
41 41
42static unsigned int i2c_scan = 0; 42static unsigned int i2c_scan;
43module_param(i2c_scan, int, 0444); 43module_param(i2c_scan, int, 0444);
44MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); 44MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
45 45
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index bb0911b4d2f6..d2e42c77b5a8 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -57,7 +57,7 @@ struct cx88_IR {
57 u32 mask_keyup; 57 u32 mask_keyup;
58}; 58};
59 59
60static int ir_debug = 0; 60static int ir_debug;
61module_param(ir_debug, int, 0644); /* debug level [IR] */ 61module_param(ir_debug, int, 0644); /* debug level [IR] */
62MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]"); 62MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
63 63
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index e357f415db06..a02cabbab778 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -39,7 +39,7 @@ MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
39MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 39MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
40MODULE_LICENSE("GPL"); 40MODULE_LICENSE("GPL");
41 41
42static unsigned int debug = 0; 42static unsigned int debug;
43module_param(debug,int,0644); 43module_param(debug,int,0644);
44MODULE_PARM_DESC(debug,"enable debug messages [mpeg]"); 44MODULE_PARM_DESC(debug,"enable debug messages [mpeg]");
45 45
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 76e5c78d8ae4..c574f450498f 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -53,15 +53,15 @@
53 53
54#include "cx88.h" 54#include "cx88.h"
55 55
56static unsigned int audio_debug = 0; 56static unsigned int audio_debug;
57module_param(audio_debug, int, 0644); 57module_param(audio_debug, int, 0644);
58MODULE_PARM_DESC(audio_debug, "enable debug messages [audio]"); 58MODULE_PARM_DESC(audio_debug, "enable debug messages [audio]");
59 59
60static unsigned int always_analog = 0; 60static unsigned int always_analog;
61module_param(always_analog,int,0644); 61module_param(always_analog,int,0644);
62MODULE_PARM_DESC(always_analog,"force analog audio out"); 62MODULE_PARM_DESC(always_analog,"force analog audio out");
63 63
64static unsigned int radio_deemphasis = 0; 64static unsigned int radio_deemphasis;
65module_param(radio_deemphasis,int,0644); 65module_param(radio_deemphasis,int,0644);
66MODULE_PARM_DESC(radio_deemphasis, "Radio deemphasis time constant, " 66MODULE_PARM_DESC(radio_deemphasis, "Radio deemphasis time constant, "
67 "0=None, 1=50us (elsewhere), 2=75us (USA)"); 67 "0=None, 1=50us (elsewhere), 2=75us (USA)");
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index d96ecfcf393a..0943060682bc 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -11,7 +11,7 @@ static unsigned int vbibufs = 4;
11module_param(vbibufs,int,0644); 11module_param(vbibufs,int,0644);
12MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32"); 12MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32");
13 13
14static unsigned int vbi_debug = 0; 14static unsigned int vbi_debug;
15module_param(vbi_debug,int,0644); 15module_param(vbi_debug,int,0644);
16MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]"); 16MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
17 17
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 227179620d13..8b293a3357b2 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -63,11 +63,11 @@ MODULE_PARM_DESC(video_nr,"video device numbers");
63MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); 63MODULE_PARM_DESC(vbi_nr,"vbi device numbers");
64MODULE_PARM_DESC(radio_nr,"radio device numbers"); 64MODULE_PARM_DESC(radio_nr,"radio device numbers");
65 65
66static unsigned int video_debug = 0; 66static unsigned int video_debug;
67module_param(video_debug,int,0644); 67module_param(video_debug,int,0644);
68MODULE_PARM_DESC(video_debug,"enable debug messages [video]"); 68MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
69 69
70static unsigned int irq_debug = 0; 70static unsigned int irq_debug;
71module_param(irq_debug,int,0644); 71module_param(irq_debug,int,0644);
72MODULE_PARM_DESC(irq_debug,"enable debug messages [IRQ handler]"); 72MODULE_PARM_DESC(irq_debug,"enable debug messages [IRQ handler]");
73 73
diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
index 9ceb6b2f3949..88d6df71d051 100644
--- a/drivers/media/video/dpc7146.c
+++ b/drivers/media/video/dpc7146.c
@@ -54,11 +54,11 @@
54 54
55#define DPC_BOARD_CAN_DO_VBI(dev) (dev->revision != 0) 55#define DPC_BOARD_CAN_DO_VBI(dev) (dev->revision != 0)
56 56
57static int debug = 0; 57static int debug;
58module_param(debug, int, 0); 58module_param(debug, int, 0);
59MODULE_PARM_DESC(debug, "debug verbosity"); 59MODULE_PARM_DESC(debug, "debug verbosity");
60 60
61static int dpc_num = 0; 61static int dpc_num;
62 62
63#define DPC_INPUTS 2 63#define DPC_INPUTS 2
64static struct v4l2_input dpc_inputs[DPC_INPUTS] = { 64static struct v4l2_input dpc_inputs[DPC_INPUTS] = {
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index c1caaa855b99..dbea89c115b1 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -31,7 +31,7 @@
31 31
32/* #define ENABLE_DEBUG_ISOC_FRAMES */ 32/* #define ENABLE_DEBUG_ISOC_FRAMES */
33 33
34static unsigned int core_debug = 0; 34static unsigned int core_debug;
35module_param(core_debug,int,0644); 35module_param(core_debug,int,0644);
36MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); 36MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
37 37
@@ -40,7 +40,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
40 printk(KERN_INFO "%s %s :"fmt, \ 40 printk(KERN_INFO "%s %s :"fmt, \
41 dev->name, __FUNCTION__ , ##arg); } while (0) 41 dev->name, __FUNCTION__ , ##arg); } while (0)
42 42
43static unsigned int reg_debug = 0; 43static unsigned int reg_debug;
44module_param(reg_debug,int,0644); 44module_param(reg_debug,int,0644);
45MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]"); 45MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
46 46
@@ -49,7 +49,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
49 printk(KERN_INFO "%s %s :"fmt, \ 49 printk(KERN_INFO "%s %s :"fmt, \
50 dev->name, __FUNCTION__ , ##arg); } while (0) 50 dev->name, __FUNCTION__ , ##arg); } while (0)
51 51
52static unsigned int isoc_debug = 0; 52static unsigned int isoc_debug;
53module_param(isoc_debug,int,0644); 53module_param(isoc_debug,int,0644);
54MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]"); 54MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
55 55
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index cacd04d46e99..c3d98d81c335 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -33,11 +33,11 @@
33 33
34/* ----------------------------------------------------------- */ 34/* ----------------------------------------------------------- */
35 35
36static unsigned int i2c_scan = 0; 36static unsigned int i2c_scan;
37module_param(i2c_scan, int, 0444); 37module_param(i2c_scan, int, 0444);
38MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); 38MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
39 39
40static unsigned int i2c_debug = 0; 40static unsigned int i2c_debug;
41module_param(i2c_debug, int, 0644); 41module_param(i2c_debug, int, 0644);
42MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); 42MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
43 43
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 4abe6701a770..c8264f40aa0d 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -74,7 +74,7 @@ MODULE_PARM_DESC(video_nr, "video device numbers");
74MODULE_PARM_DESC(vbi_nr, "vbi device numbers"); 74MODULE_PARM_DESC(vbi_nr, "vbi device numbers");
75MODULE_PARM_DESC(radio_nr, "radio device numbers"); 75MODULE_PARM_DESC(radio_nr, "radio device numbers");
76 76
77static unsigned int video_debug = 0; 77static unsigned int video_debug;
78module_param(video_debug,int,0644); 78module_param(video_debug,int,0644);
79MODULE_PARM_DESC(video_debug,"enable debug messages [video]"); 79MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
80 80
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 06b6a3ae06c4..32ebb71097b5 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -2538,7 +2538,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
2538{ 2538{
2539 struct usb_device *udev = interface_to_usbdev(intf); 2539 struct usb_device *udev = interface_to_usbdev(intf);
2540 struct et61x251_device* cam; 2540 struct et61x251_device* cam;
2541 static unsigned int dev_nr = 0; 2541 static unsigned int dev_nr;
2542 unsigned int i; 2542 unsigned int i;
2543 int err = 0; 2543 int err = 0;
2544 2544
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index c7fed3405655..352f84d440fb 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -25,12 +25,12 @@
25 25
26#include <media/saa7146_vv.h> 26#include <media/saa7146_vv.h>
27 27
28static int debug = 0; 28static int debug;
29module_param(debug, int, 0); 29module_param(debug, int, 0);
30MODULE_PARM_DESC(debug, "debug verbosity"); 30MODULE_PARM_DESC(debug, "debug verbosity");
31 31
32/* global variables */ 32/* global variables */
33static int hexium_num = 0; 33static int hexium_num;
34 34
35#define HEXIUM_GEMINI 4 35#define HEXIUM_GEMINI 4
36#define HEXIUM_GEMINI_DUAL 5 36#define HEXIUM_GEMINI_DUAL 5
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 137c4736da04..8d3c1482e7ea 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -25,12 +25,12 @@
25 25
26#include <media/saa7146_vv.h> 26#include <media/saa7146_vv.h>
27 27
28static int debug = 0; 28static int debug;
29module_param(debug, int, 0); 29module_param(debug, int, 0);
30MODULE_PARM_DESC(debug, "debug verbosity"); 30MODULE_PARM_DESC(debug, "debug verbosity");
31 31
32/* global variables */ 32/* global variables */
33static int hexium_num = 0; 33static int hexium_num;
34 34
35#define HEXIUM_HV_PCI6_ORION 1 35#define HEXIUM_HV_PCI6_ORION 1
36#define HEXIUM_ORION_1SVHS_3BNC 2 36#define HEXIUM_ORION_1SVHS_3BNC 2
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index dabafdf71e60..ba7a74979dfb 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -50,7 +50,7 @@
50static int debug; 50static int debug;
51module_param(debug, int, 0644); /* debug level (0,1,2) */ 51module_param(debug, int, 0644); /* debug level (0,1,2) */
52 52
53static int hauppauge = 0; 53static int hauppauge;
54module_param(hauppauge, int, 0644); /* Choose Hauppauge remote */ 54module_param(hauppauge, int, 0644); /* Choose Hauppauge remote */
55MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)"); 55MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)");
56 56
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 948ca35e7ee8..b533188c9439 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -126,11 +126,11 @@ static int dec_mpg_buffers = IVTV_DEFAULT_DEC_MPG_BUFFERS;
126static int dec_yuv_buffers = IVTV_DEFAULT_DEC_YUV_BUFFERS; 126static int dec_yuv_buffers = IVTV_DEFAULT_DEC_YUV_BUFFERS;
127static int dec_vbi_buffers = IVTV_DEFAULT_DEC_VBI_BUFFERS; 127static int dec_vbi_buffers = IVTV_DEFAULT_DEC_VBI_BUFFERS;
128 128
129static int ivtv_yuv_mode = 0; 129static int ivtv_yuv_mode;
130static int ivtv_yuv_threshold=-1; 130static int ivtv_yuv_threshold = -1;
131static int ivtv_pci_latency = 1; 131static int ivtv_pci_latency = 1;
132 132
133int ivtv_debug = 0; 133int ivtv_debug;
134 134
135static int newi2c = -1; 135static int newi2c = -1;
136 136
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 3d51fa0a52b6..a079e7222cc9 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -789,7 +789,7 @@ static irqreturn_t meye_irq(int irq, void *dev_id)
789{ 789{
790 u32 v; 790 u32 v;
791 int reqnr; 791 int reqnr;
792 static int sequence = 0; 792 static int sequence;
793 793
794 v = mchip_read(MCHIP_MM_INTA); 794 v = mchip_read(MCHIP_MM_INTA);
795 795
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 74fd6a01d4c4..1fa89dbdff24 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -10,7 +10,7 @@
10#include "tuner-i2c.h" 10#include "tuner-i2c.h"
11#include "mt20xx.h" 11#include "mt20xx.h"
12 12
13static int debug = 0; 13static int debug;
14module_param(debug, int, 0644); 14module_param(debug, int, 0644);
15MODULE_PARM_DESC(debug, "enable verbose debug messages"); 15MODULE_PARM_DESC(debug, "enable verbose debug messages");
16 16
@@ -24,7 +24,7 @@ module_param(optimize_vco, int, 0644);
24static unsigned int tv_antenna = 1; 24static unsigned int tv_antenna = 1;
25module_param(tv_antenna, int, 0644); 25module_param(tv_antenna, int, 0644);
26 26
27static unsigned int radio_antenna = 0; 27static unsigned int radio_antenna;
28module_param(radio_antenna, int, 0644); 28module_param(radio_antenna, int, 0644);
29 29
30/* ---------------------------------------------------------------------- */ 30/* ---------------------------------------------------------------------- */
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index cb5a510f9251..f68e91fbe7fb 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -38,7 +38,7 @@
38#define MXB_BOARD_CAN_DO_VBI(dev) (dev->revision != 0) 38#define MXB_BOARD_CAN_DO_VBI(dev) (dev->revision != 0)
39 39
40/* global variable */ 40/* global variable */
41static int mxb_num = 0; 41static int mxb_num;
42 42
43/* initial frequence the tuner will be tuned to. 43/* initial frequence the tuner will be tuned to.
44 in verden (lower saxony, germany) 4148 is a 44 in verden (lower saxony, germany) 4148 is a
@@ -47,7 +47,7 @@ static int freq = 4148;
47module_param(freq, int, 0644); 47module_param(freq, int, 0644);
48MODULE_PARM_DESC(freq, "initial frequency the tuner will be tuned to while setup"); 48MODULE_PARM_DESC(freq, "initial frequency the tuner will be tuned to while setup");
49 49
50static int debug = 0; 50static int debug;
51module_param(debug, int, 0644); 51module_param(debug, int, 0644);
52MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 52MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
53 53
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 6820c2aabd30..4a6c5723f7cc 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -57,11 +57,11 @@ struct i2c_info
57 u8 hits; 57 u8 hits;
58}; 58};
59 59
60static int i2c_count = 0; 60static int i2c_count;
61static struct i2c_info i2cinfo[64]; 61static struct i2c_info i2cinfo[64];
62 62
63static int decoder = PHILIPS2; 63static int decoder = PHILIPS2;
64static int standard = 0; /* 0 - auto 1 - ntsc 2 - pal 3 - secam */ 64static int standard; /* 0 - auto 1 - ntsc 2 - pal 3 - secam */
65 65
66/* 66/*
67 * I/O ports and Shared Memory 67 * I/O ports and Shared Memory
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 2404053a4d85..9199b5defb6b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -43,13 +43,13 @@
43static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL}; 43static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL};
44static DEFINE_MUTEX(pvr2_unit_mtx); 44static DEFINE_MUTEX(pvr2_unit_mtx);
45 45
46static int ctlchg = 0; 46static int ctlchg;
47static int initusbreset = 1; 47static int initusbreset = 1;
48static int procreload = 0; 48static int procreload;
49static int tuner[PVR_NUM] = { [0 ... PVR_NUM-1] = -1 }; 49static int tuner[PVR_NUM] = { [0 ... PVR_NUM-1] = -1 };
50static int tolerance[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 }; 50static int tolerance[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 };
51static int video_std[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 }; 51static int video_std[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 };
52static int init_pause_msec = 0; 52static int init_pause_msec;
53 53
54module_param(ctlchg, int, S_IRUGO|S_IWUSR); 54module_param(ctlchg, int, S_IRUGO|S_IWUSR);
55MODULE_PARM_DESC(ctlchg, "0=optimize ctl change 1=always accept new ctl value"); 55MODULE_PARM_DESC(ctlchg, "0=optimize ctl change 1=always accept new ctl value");
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 62867fa3517a..793c89a8d672 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -35,7 +35,7 @@
35 35
36*/ 36*/
37 37
38static unsigned int i2c_scan = 0; 38static unsigned int i2c_scan;
39module_param(i2c_scan, int, S_IRUGO|S_IWUSR); 39module_param(i2c_scan, int, S_IRUGO|S_IWUSR);
40MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); 40MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
41 41
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index e0a453a6543d..b6240a1a606f 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -130,8 +130,8 @@ static int default_fbufs = 3; /* Default number of frame buffers */
130#ifdef CONFIG_USB_PWC_DEBUG 130#ifdef CONFIG_USB_PWC_DEBUG
131 int pwc_trace = PWC_DEBUG_LEVEL; 131 int pwc_trace = PWC_DEBUG_LEVEL;
132#endif 132#endif
133static int power_save = 0; 133static int power_save;
134static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */ 134static int led_on = 100, led_off; /* defaults to LED that is on while in use */
135static int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */ 135static int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */
136static struct { 136static struct {
137 int type; 137 int type;
@@ -786,8 +786,8 @@ static void pwc_isoc_handler(struct urb *urb)
786 } /* ..status == 0 */ 786 } /* ..status == 0 */
787 else { 787 else {
788 /* This is normally not interesting to the user, unless 788 /* This is normally not interesting to the user, unless
789 * you are really debugging something */ 789 * you are really debugging something, default = 0 */
790 static int iso_error = 0; 790 static int iso_error;
791 iso_error++; 791 iso_error++;
792 if (iso_error < 20) 792 if (iso_error < 20)
793 PWC_DEBUG_FLOW("Iso frame %d of USB has error %d\n", i, fst); 793 PWC_DEBUG_FLOW("Iso frame %d of USB has error %d\n", i, fst);
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 72e344a12c79..716ee7f64df3 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -44,10 +44,10 @@ static unsigned short normal_i2c[] = {
44I2C_CLIENT_INSMOD; 44I2C_CLIENT_INSMOD;
45 45
46/* insmod options */ 46/* insmod options */
47static unsigned int debug = 0; 47static unsigned int debug;
48static unsigned int xtal = 0; 48static unsigned int xtal;
49static unsigned int rbds = 0; 49static unsigned int rbds;
50static unsigned int plvl = 0; 50static unsigned int plvl;
51static unsigned int bufblocks = 100; 51static unsigned int bufblocks = 100;
52 52
53module_param(debug, int, 0644); 53module_param(debug, int, 0644);
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 1df2602cd184..4aa82b310708 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
46#include <media/v4l2-common.h> 46#include <media/v4l2-common.h>
47#include <linux/video_decoder.h> 47#include <linux/video_decoder.h>
48 48
49static int debug = 0; 49static int debug;
50module_param(debug, int, 0); 50module_param(debug, int, 0);
51MODULE_PARM_DESC(debug, "Debug level (0-1)"); 51MODULE_PARM_DESC(debug, "Debug level (0-1)");
52 52
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index a0772c53bb1f..96c3d4357722 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -55,7 +55,7 @@ MODULE_LICENSE("GPL");
55#define I2C_NAME(s) (s)->name 55#define I2C_NAME(s) (s)->name
56 56
57 57
58static int debug = 0; 58static int debug;
59module_param(debug, int, 0644); 59module_param(debug, int, 0644);
60MODULE_PARM_DESC(debug, "Debug level (0-1)"); 60MODULE_PARM_DESC(debug, "Debug level (0-1)");
61 61
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index bf91a4faa706..e79075533beb 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -56,7 +56,7 @@ MODULE_LICENSE("GPL");
56#define I2C_NAME(x) (x)->name 56#define I2C_NAME(x) (x)->name
57 57
58 58
59static int debug = 0; 59static int debug;
60module_param(debug, int, 0); 60module_param(debug, int, 0);
61MODULE_PARM_DESC(debug, "Debug level (0-1)"); 61MODULE_PARM_DESC(debug, "Debug level (0-1)");
62 62
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 41e5e518a47e..aaec17f9d4eb 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -57,7 +57,7 @@ MODULE_AUTHOR( "Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, "
57 "Hans Verkuil, Mauro Carvalho Chehab"); 57 "Hans Verkuil, Mauro Carvalho Chehab");
58MODULE_LICENSE("GPL"); 58MODULE_LICENSE("GPL");
59 59
60static int debug = 0; 60static int debug;
61module_param(debug, bool, 0644); 61module_param(debug, bool, 0644);
62 62
63MODULE_PARM_DESC(debug, "Debug level (0-1)"); 63MODULE_PARM_DESC(debug, "Debug level (0-1)");
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 80bf91187856..cedb988574bd 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");
48 48
49#include <linux/video_decoder.h> 49#include <linux/video_decoder.h>
50 50
51static int debug = 0; 51static int debug;
52module_param(debug, int, 0644); 52module_param(debug, int, 0644);
53MODULE_PARM_DESC(debug, " Set the default Debug level. Default: 0 (Off) - (0-1)"); 53MODULE_PARM_DESC(debug, " Set the default Debug level. Default: 0 (Off) - (0-1)");
54 54
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 047add8f3010..505bc0a478af 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -31,7 +31,7 @@
31#include "saa7134.h" 31#include "saa7134.h"
32#include "saa7134-reg.h" 32#include "saa7134-reg.h"
33 33
34static unsigned int debug = 0; 34static unsigned int debug;
35module_param(debug, int, 0644); 35module_param(debug, int, 0644);
36MODULE_PARM_DESC(debug,"enable debug messages [alsa]"); 36MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
37 37
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 58ab163fdbd7..ef1fd5a93b1b 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -42,23 +42,23 @@ MODULE_LICENSE("GPL");
42 42
43/* ------------------------------------------------------------------ */ 43/* ------------------------------------------------------------------ */
44 44
45static unsigned int irq_debug = 0; 45static unsigned int irq_debug;
46module_param(irq_debug, int, 0644); 46module_param(irq_debug, int, 0644);
47MODULE_PARM_DESC(irq_debug,"enable debug messages [IRQ handler]"); 47MODULE_PARM_DESC(irq_debug,"enable debug messages [IRQ handler]");
48 48
49static unsigned int core_debug = 0; 49static unsigned int core_debug;
50module_param(core_debug, int, 0644); 50module_param(core_debug, int, 0644);
51MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); 51MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
52 52
53static unsigned int gpio_tracking = 0; 53static unsigned int gpio_tracking;
54module_param(gpio_tracking, int, 0644); 54module_param(gpio_tracking, int, 0644);
55MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]"); 55MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]");
56 56
57static unsigned int alsa = 0; 57static unsigned int alsa;
58module_param(alsa, int, 0644); 58module_param(alsa, int, 0644);
59MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]"); 59MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]");
60 60
61static unsigned int oss = 0; 61static unsigned int oss;
62module_param(oss, int, 0644); 62module_param(oss, int, 0644);
63MODULE_PARM_DESC(oss,"enable OSS DMA sound [dmasound]"); 63MODULE_PARM_DESC(oss,"enable OSS DMA sound [dmasound]");
64 64
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index ea2be9eceeb8..9d61d74fabd4 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -47,16 +47,16 @@
47MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 47MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
48MODULE_LICENSE("GPL"); 48MODULE_LICENSE("GPL");
49 49
50static unsigned int antenna_pwr = 0; 50static unsigned int antenna_pwr;
51 51
52module_param(antenna_pwr, int, 0444); 52module_param(antenna_pwr, int, 0444);
53MODULE_PARM_DESC(antenna_pwr,"enable antenna power (Pinnacle 300i)"); 53MODULE_PARM_DESC(antenna_pwr,"enable antenna power (Pinnacle 300i)");
54 54
55static int use_frontend = 0; 55static int use_frontend;
56module_param(use_frontend, int, 0644); 56module_param(use_frontend, int, 0644);
57MODULE_PARM_DESC(use_frontend,"for cards with multiple frontends (0: terrestrial, 1: satellite)"); 57MODULE_PARM_DESC(use_frontend,"for cards with multiple frontends (0: terrestrial, 1: satellite)");
58 58
59static int debug = 0; 59static int debug;
60module_param(debug, int, 0644); 60module_param(debug, int, 0644);
61MODULE_PARM_DESC(debug, "Turn on/off module debugging (default:off)."); 61MODULE_PARM_DESC(debug, "Turn on/off module debugging (default:off).");
62 62
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 3d2ec30de227..40d4a66b77f5 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -40,7 +40,7 @@ static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
40module_param_array(empress_nr, int, NULL, 0444); 40module_param_array(empress_nr, int, NULL, 0444);
41MODULE_PARM_DESC(empress_nr,"ts device number"); 41MODULE_PARM_DESC(empress_nr,"ts device number");
42 42
43static unsigned int debug = 0; 43static unsigned int debug;
44module_param(debug, int, 0644); 44module_param(debug, int, 0644);
45MODULE_PARM_DESC(debug,"enable debug messages"); 45MODULE_PARM_DESC(debug,"enable debug messages");
46 46
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index d3322c3018f2..ba71dd0040be 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -33,11 +33,11 @@
33 33
34/* ----------------------------------------------------------- */ 34/* ----------------------------------------------------------- */
35 35
36static unsigned int i2c_debug = 0; 36static unsigned int i2c_debug;
37module_param(i2c_debug, int, 0644); 37module_param(i2c_debug, int, 0644);
38MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); 38MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]");
39 39
40static unsigned int i2c_scan = 0; 40static unsigned int i2c_scan;
41module_param(i2c_scan, int, 0444); 41module_param(i2c_scan, int, 0444);
42MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); 42MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
43 43
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index b4188819782f..65f8e594d6fb 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -27,15 +27,15 @@
27#include "saa7134-reg.h" 27#include "saa7134-reg.h"
28#include "saa7134.h" 28#include "saa7134.h"
29 29
30static unsigned int disable_ir = 0; 30static unsigned int disable_ir;
31module_param(disable_ir, int, 0444); 31module_param(disable_ir, int, 0444);
32MODULE_PARM_DESC(disable_ir,"disable infrared remote support"); 32MODULE_PARM_DESC(disable_ir,"disable infrared remote support");
33 33
34static unsigned int ir_debug = 0; 34static unsigned int ir_debug;
35module_param(ir_debug, int, 0644); 35module_param(ir_debug, int, 0644);
36MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]"); 36MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");
37 37
38static int pinnacle_remote = 0; 38static int pinnacle_remote;
39module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */ 39module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */
40MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)"); 40MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
41 41
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index f1b8fcaeb43a..eae72fd60cec 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -32,7 +32,7 @@
32 32
33/* ------------------------------------------------------------------ */ 33/* ------------------------------------------------------------------ */
34 34
35static unsigned int ts_debug = 0; 35static unsigned int ts_debug;
36module_param(ts_debug, int, 0644); 36module_param(ts_debug, int, 0644);
37MODULE_PARM_DESC(ts_debug,"enable debug messages [ts]"); 37MODULE_PARM_DESC(ts_debug,"enable debug messages [ts]");
38 38
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 4e9810469ae3..b90c55c0536e 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -35,18 +35,18 @@
35 35
36/* ------------------------------------------------------------------ */ 36/* ------------------------------------------------------------------ */
37 37
38static unsigned int audio_debug = 0; 38static unsigned int audio_debug;
39module_param(audio_debug, int, 0644); 39module_param(audio_debug, int, 0644);
40MODULE_PARM_DESC(audio_debug,"enable debug messages [tv audio]"); 40MODULE_PARM_DESC(audio_debug,"enable debug messages [tv audio]");
41 41
42static unsigned int audio_ddep = 0; 42static unsigned int audio_ddep;
43module_param(audio_ddep, int, 0644); 43module_param(audio_ddep, int, 0644);
44MODULE_PARM_DESC(audio_ddep,"audio ddep overwrite"); 44MODULE_PARM_DESC(audio_ddep,"audio ddep overwrite");
45 45
46static int audio_clock_override = UNSET; 46static int audio_clock_override = UNSET;
47module_param(audio_clock_override, int, 0644); 47module_param(audio_clock_override, int, 0644);
48 48
49static int audio_clock_tweak = 0; 49static int audio_clock_tweak;
50module_param(audio_clock_tweak, int, 0644); 50module_param(audio_clock_tweak, int, 0644);
51MODULE_PARM_DESC(audio_clock_tweak, "Audio clock tick fine tuning for cards with audio crystal that's slightly off (range [-1024 .. 1024])"); 51MODULE_PARM_DESC(audio_clock_tweak, "Audio clock tick fine tuning for cards with audio crystal that's slightly off (range [-1024 .. 1024])");
52 52
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index f0d5ed9c2b06..cb0304298a96 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -31,7 +31,7 @@
31 31
32/* ------------------------------------------------------------------ */ 32/* ------------------------------------------------------------------ */
33 33
34static unsigned int vbi_debug = 0; 34static unsigned int vbi_debug;
35module_param(vbi_debug, int, 0644); 35module_param(vbi_debug, int, 0644);
36MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]"); 36MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
37 37
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 39c41ad97d0e..5385026a85ef 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -40,7 +40,7 @@
40 40
41unsigned int video_debug; 41unsigned int video_debug;
42static unsigned int gbuffers = 8; 42static unsigned int gbuffers = 8;
43static unsigned int noninterlaced = 0; 43static unsigned int noninterlaced; /* 0 */
44static unsigned int gbufsize = 720*576*4; 44static unsigned int gbufsize = 720*576*4;
45static unsigned int gbufsize_max = 720*576*4; 45static unsigned int gbufsize_max = 720*576*4;
46static char secam[] = "--"; 46static char secam[] = "--";
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 41f70440fd3b..02fda4eecea3 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
52#define I2C_NAME(s) (s)->name 52#define I2C_NAME(s) (s)->name
53 53
54 54
55static int debug = 0; 55static int debug;
56module_param(debug, int, 0); 56module_param(debug, int, 0);
57MODULE_PARM_DESC(debug, "Debug level (0-1)"); 57MODULE_PARM_DESC(debug, "Debug level (0-1)");
58 58
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index d5d7d6cf734a..312a01a1f095 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -35,7 +35,7 @@ static const char version[] = "0.24";
35#include <linux/usb.h> 35#include <linux/usb.h>
36#include "se401.h" 36#include "se401.h"
37 37
38static int flickerless=0; 38static int flickerless;
39static int video_nr = -1; 39static int video_nr = -1;
40 40
41static struct usb_device_id device_table [] = { 41static struct usb_device_id device_table [] = {
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index c40ba3adab21..e5ef0190ebdc 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -3239,7 +3239,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
3239{ 3239{
3240 struct usb_device *udev = interface_to_usbdev(intf); 3240 struct usb_device *udev = interface_to_usbdev(intf);
3241 struct sn9c102_device* cam; 3241 struct sn9c102_device* cam;
3242 static unsigned int dev_nr = 0; 3242 static unsigned int dev_nr;
3243 unsigned int i; 3243 unsigned int i;
3244 int err = 0, r; 3244 int err = 0, r;
3245 3245
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 3fb85af5d1f2..3118dd322b24 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -58,7 +58,7 @@
58 58
59static struct saa7146 saa7146s[SAA7146_MAX]; 59static struct saa7146 saa7146s[SAA7146_MAX];
60 60
61static int saa_num = 0; /* number of SAA7146s in use */ 61static int saa_num; /* number of SAA7146s in use */
62 62
63static int video_nr = -1; 63static int video_nr = -1;
64module_param(video_nr, int, 0); 64module_param(video_nr, int, 0);
@@ -248,7 +248,7 @@ static void I2CBusScan(struct saa7146 *saa)
248 attach_inform(saa, i); 248 attach_inform(saa, i);
249} 249}
250 250
251static int debiwait_maxwait = 0; 251static int debiwait_maxwait;
252 252
253static int wait_for_debi_done(struct saa7146 *saa) 253static int wait_for_debi_done(struct saa7146 *saa)
254{ 254{
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index afc32aa56fde..1542797c048f 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -72,10 +72,13 @@
72#include "stv680.h" 72#include "stv680.h"
73 73
74static int video_nr = -1; 74static int video_nr = -1;
75static int swapRGB = 0; /* default for auto sleect */
76static int swapRGB_on = 0; /* default to allow auto select; -1=swap never, +1= swap always */
77 75
78static unsigned int debug = 0; 76static int swapRGB; /* 0 = default for auto select */
77
78/* 0 = default to allow auto select; -1 = swap never, +1 = swap always */
79static int swapRGB_on;
80
81static unsigned int debug;
79 82
80#define PDEBUG(level, fmt, args...) \ 83#define PDEBUG(level, fmt, args...) \
81 do { \ 84 do { \
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index bdca5d278978..269761ce84a5 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -31,7 +31,7 @@
31 31
32#include "tda9840.h" 32#include "tda9840.h"
33 33
34static int debug = 0; /* insmod parameter */ 34static int debug; /* insmod parameter */
35module_param(debug, int, 0644); 35module_param(debug, int, 0644);
36MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 36MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
37#define dprintk(args...) \ 37#define dprintk(args...) \
diff --git a/drivers/media/video/tea5761.c b/drivers/media/video/tea5761.c
index 5326eeceaacd..35612665d933 100644
--- a/drivers/media/video/tea5761.c
+++ b/drivers/media/video/tea5761.c
@@ -14,7 +14,7 @@
14#include "tuner-i2c.h" 14#include "tuner-i2c.h"
15#include "tea5761.h" 15#include "tea5761.h"
16 16
17static int debug = 0; 17static int debug;
18module_param(debug, int, 0644); 18module_param(debug, int, 0644);
19MODULE_PARM_DESC(debug, "enable verbose debug messages"); 19MODULE_PARM_DESC(debug, "enable verbose debug messages");
20 20
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index e1b48d87e7b7..ba66c6d3e2b9 100644
--- a/drivers/media/video/tea5767.c
+++ b/drivers/media/video/tea5767.c
@@ -16,7 +16,7 @@
16#include "tuner-i2c.h" 16#include "tuner-i2c.h"
17#include "tea5767.h" 17#include "tea5767.h"
18 18
19static int debug = 0; 19static int debug;
20module_param(debug, int, 0644); 20module_param(debug, int, 0644);
21MODULE_PARM_DESC(debug, "enable verbose debug messages"); 21MODULE_PARM_DESC(debug, "enable verbose debug messages");
22 22
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index df2fad9f391e..f22620e1872e 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -33,7 +33,7 @@
33 33
34#include "tea6415c.h" 34#include "tea6415c.h"
35 35
36static int debug = 0; /* insmod parameter */ 36static int debug; /* insmod parameter */
37module_param(debug, int, 0644); 37module_param(debug, int, 0644);
38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
39#define dprintk(args...) \ 39#define dprintk(args...) \
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 4ff6c63f7237..dc0f0405f4c9 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -33,7 +33,7 @@
33 33
34#include "tea6420.h" 34#include "tea6420.h"
35 35
36static int debug = 0; /* insmod parameter */ 36static int debug; /* insmod parameter */
37module_param(debug, int, 0644); 37module_param(debug, int, 0644);
38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); 38MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
39#define dprintk(args...) \ 39#define dprintk(args...) \
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 78a09a2a4857..770dbcbecb63 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -68,9 +68,9 @@ static unsigned short normal_i2c[] = {
68I2C_CLIENT_INSMOD; 68I2C_CLIENT_INSMOD;
69 69
70/* insmod options used at init time => read/only */ 70/* insmod options used at init time => read/only */
71static unsigned int addr = 0; 71static unsigned int addr;
72static unsigned int no_autodetect = 0; 72static unsigned int no_autodetect;
73static unsigned int show_i2c = 0; 73static unsigned int show_i2c;
74 74
75/* insmod options used at runtime => read/write */ 75/* insmod options used at runtime => read/write */
76static int tuner_debug; 76static int tuner_debug;
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 01ebcec040c4..f29a2cd0f2f2 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -38,7 +38,7 @@
38/* ---------------------------------------------------------------------- */ 38/* ---------------------------------------------------------------------- */
39/* insmod args */ 39/* insmod args */
40 40
41static int debug = 0; /* insmod parameter */ 41static int debug; /* insmod parameter */
42module_param(debug, int, 0644); 42module_param(debug, int, 0644);
43 43
44MODULE_DESCRIPTION("device driver for various i2c TV sound decoder / audiomux chips"); 44MODULE_DESCRIPTION("device driver for various i2c TV sound decoder / audiomux chips");
@@ -1235,11 +1235,11 @@ static int tda9850 = 1;
1235static int tda9855 = 1; 1235static int tda9855 = 1;
1236static int tda9873 = 1; 1236static int tda9873 = 1;
1237static int tda9874a = 1; 1237static int tda9874a = 1;
1238static int tea6300 = 0; /* address clash with msp34xx */ 1238static int tea6300; /* default 0 - address clash with msp34xx */
1239static int tea6320 = 0; /* address clash with msp34xx */ 1239static int tea6320; /* default 0 - address clash with msp34xx */
1240static int tea6420 = 1; 1240static int tea6420 = 1;
1241static int pic16c54 = 1; 1241static int pic16c54 = 1;
1242static int ta8874z = 0; /* address clash with tda9840 */ 1242static int ta8874z; /* default 0 - address clash with tda9840 */
1243 1243
1244module_param(tda8425, int, 0444); 1244module_param(tda8425, int, 0444);
1245module_param(tda9840, int, 0444); 1245module_param(tda9840, int, 0444);
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index b6e24e714a23..6a3af1005f03 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -27,7 +27,7 @@ static unsigned short normal_i2c[] = {
27 27
28I2C_CLIENT_INSMOD; 28I2C_CLIENT_INSMOD;
29 29
30static int debug = 0; 30static int debug;
31module_param(debug, int, 0); 31module_param(debug, int, 0);
32MODULE_PARM_DESC(debug, "Debug level (0-1)"); 32MODULE_PARM_DESC(debug, "Debug level (0-1)");
33 33
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index 14db95e10cfe..84ee6b1d9fd2 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -121,7 +121,7 @@ static int init_model2_yb = -1;
121 121
122/* 01.01.08 - Added for RCA video in support -LO */ 122/* 01.01.08 - Added for RCA video in support -LO */
123/* Settings for camera model 3 */ 123/* Settings for camera model 3 */
124static int init_model3_input = 0; 124static int init_model3_input;
125 125
126module_param(debug, int, 0); 126module_param(debug, int, 0);
127MODULE_PARM_DESC(debug, "Debug level: 0-9 (default=0)"); 127MODULE_PARM_DESC(debug, "Debug level: 0-9 (default=0)");
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 719b17ce83f8..97479609f97d 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -61,7 +61,7 @@ static int debug;
61 } 61 }
62#else 62#else
63#define DEBUG(n, arg...) 63#define DEBUG(n, arg...)
64static const int debug = 0; 64static const int debug;
65#endif 65#endif
66 66
67 67
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index a2acba0bcc47..e0ee6d8f2565 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -50,7 +50,7 @@ static int debug;
50 } 50 }
51#else 51#else
52#define DEBUG(n, arg...) 52#define DEBUG(n, arg...)
53static const int debug = 0; 53static const int debug;
54#endif 54#endif
55 55
56#define DRIVER_VERSION "v0.01" 56#define DRIVER_VERSION "v0.01"
diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
index 95453c108d40..9544e644bf0d 100644
--- a/drivers/media/video/usbvideo/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -28,9 +28,9 @@ typedef struct {
28 28
29static struct usbvideo *cams = NULL; 29static struct usbvideo *cams = NULL;
30 30
31static int debug = 0; 31static int debug;
32 32
33static int flags = 0; /* FLAGS_DISPLAY_HINTS | FLAGS_OVERLAY_STATS; */ 33static int flags; /* FLAGS_DISPLAY_HINTS | FLAGS_OVERLAY_STATS; */
34 34
35static const int min_canvasWidth = 8; 35static const int min_canvasWidth = 8;
36static const int min_canvasHeight = 4; 36static const int min_canvasHeight = 4;
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 5d363be7bc73..f1ccf59545d4 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -522,7 +522,7 @@ void usbvideo_TestPattern(struct uvd *uvd, int fullframe, int pmode)
522 struct usbvideo_frame *frame; 522 struct usbvideo_frame *frame;
523 int num_cell = 0; 523 int num_cell = 0;
524 int scan_length = 0; 524 int scan_length = 0;
525 static int num_pass = 0; 525 static int num_pass;
526 526
527 if (uvd == NULL) { 527 if (uvd == NULL) {
528 err("%s: uvd == NULL", __FUNCTION__); 528 err("%s: uvd == NULL", __FUNCTION__);
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 56775ab8b75d..47f64a031cad 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -53,19 +53,21 @@
53 53
54#include "usbvision.h" 54#include "usbvision.h"
55 55
56static unsigned int core_debug = 0; 56static unsigned int core_debug;
57module_param(core_debug,int,0644); 57module_param(core_debug,int,0644);
58MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); 58MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
59 59
60static unsigned int force_testpattern = 0; 60static unsigned int force_testpattern;
61module_param(force_testpattern,int,0644); 61module_param(force_testpattern,int,0644);
62MODULE_PARM_DESC(force_testpattern,"enable test pattern display [core]"); 62MODULE_PARM_DESC(force_testpattern,"enable test pattern display [core]");
63 63
64static int adjustCompression = 1; // Set the compression to be adaptive 64static int adjustCompression = 1; /* Set the compression to be adaptive */
65module_param(adjustCompression, int, 0444); 65module_param(adjustCompression, int, 0444);
66MODULE_PARM_DESC(adjustCompression, " Set the ADPCM compression for the device. Default: 1 (On)"); 66MODULE_PARM_DESC(adjustCompression, " Set the ADPCM compression for the device. Default: 1 (On)");
67 67
68static int SwitchSVideoInput = 0; // To help people with Black and White output with using s-video input. Some cables and input device are wired differently. 68/* To help people with Black and White output with using s-video input.
69 * Some cables and input device are wired differently. */
70static int SwitchSVideoInput;
69module_param(SwitchSVideoInput, int, 0444); 71module_param(SwitchSVideoInput, int, 0444);
70MODULE_PARM_DESC(SwitchSVideoInput, " Set the S-Video input. Some cables and input device are wired differently. Default: 0 (Off)"); 72MODULE_PARM_DESC(SwitchSVideoInput, " Set the S-Video input. Some cables and input device are wired differently. Default: 0 (Off)");
71 73
@@ -418,7 +420,7 @@ static void usbvision_testpattern(struct usb_usbvision *usbvision,
418 unsigned char *f; 420 unsigned char *f;
419 int num_cell = 0; 421 int num_cell = 0;
420 int scan_length = 0; 422 int scan_length = 0;
421 static int num_pass = 0; 423 static int num_pass;
422 424
423 if (usbvision == NULL) { 425 if (usbvision == NULL) {
424 printk(KERN_ERR "%s: usbvision == NULL\n", proc); 426 printk(KERN_ERR "%s: usbvision == NULL\n", proc);
@@ -1430,7 +1432,7 @@ static int usbvision_compress_isochronous(struct usb_usbvision *usbvision,
1430 } 1432 }
1431#if ENABLE_HEXDUMP 1433#if ENABLE_HEXDUMP
1432 if (totlen > 0) { 1434 if (totlen > 0) {
1433 static int foo = 0; 1435 static int foo;
1434 if (foo < 1) { 1436 if (foo < 1) {
1435 printk(KERN_DEBUG "+%d.\n", usbvision->scratchlen); 1437 printk(KERN_DEBUG "+%d.\n", usbvision->scratchlen);
1436 usbvision_hexdump(data0, (totlen > 64) ? 64 : totlen); 1438 usbvision_hexdump(data0, (totlen > 64) ? 64 : totlen);
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index aabc42cae9c7..a7ed6f21f119 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -40,7 +40,7 @@
40 40
41#define DBG_I2C 1<<0 41#define DBG_I2C 1<<0
42 42
43static int i2c_debug = 0; 43static int i2c_debug;
44 44
45module_param (i2c_debug, int, 0644); // debug_i2c_usb mode of the device driver 45module_param (i2c_debug, int, 0644); // debug_i2c_usb mode of the device driver
46MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); 46MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index df52f8a60215..2c2e10639564 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -115,7 +115,7 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL)
115 115
116 116
117/* sequential number of usbvision device */ 117/* sequential number of usbvision device */
118static int usbvision_nr = 0; 118static int usbvision_nr;
119 119
120static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = { 120static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
121 { 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" }, 121 { 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" },
@@ -135,7 +135,7 @@ static void usbvision_release(struct usb_usbvision *usbvision);
135/* Set the default format for ISOC endpoint */ 135/* Set the default format for ISOC endpoint */
136static int isocMode = ISOC_MODE_COMPRESS; 136static int isocMode = ISOC_MODE_COMPRESS;
137/* Set the default Debug Mode of the device driver */ 137/* Set the default Debug Mode of the device driver */
138static int video_debug = 0; 138static int video_debug;
139/* Set the default device to power on at startup */ 139/* Set the default device to power on at startup */
140static int PowerOnAtOpen = 1; 140static int PowerOnAtOpen = 1;
141/* Sequential Number of Video Device */ 141/* Sequential Number of Video Device */
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index e3ac5e686075..ffd3f106dd4f 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -39,7 +39,7 @@
39#include <linux/kmod.h> 39#include <linux/kmod.h>
40#endif 40#endif
41 41
42static unsigned int debug = 0; 42static unsigned int debug;
43module_param(debug, int, 0644); 43module_param(debug, int, 0644);
44MODULE_PARM_DESC(debug,"enable debug messages"); 44MODULE_PARM_DESC(debug,"enable debug messages");
45MODULE_AUTHOR("Bill Dirks"); 45MODULE_AUTHOR("Bill Dirks");
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 53fed4b74ce9..7008afabe92c 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -39,7 +39,7 @@
39#define MAGIC_CHECK(is,should) if (unlikely((is) != (should))) \ 39#define MAGIC_CHECK(is,should) if (unlikely((is) != (should))) \
40 { printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); } 40 { printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); }
41 41
42static int debug = 0; 42static int debug;
43module_param(debug, int, 0644); 43module_param(debug, int, 0644);
44 44
45MODULE_DESCRIPTION("helper module to manage video4linux pci dma sg buffers"); 45MODULE_DESCRIPTION("helper module to manage video4linux pci dma sg buffers");
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index b73aba65d21d..4ba8b7db7fda 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -30,7 +30,7 @@
30MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); 30MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
31MODULE_LICENSE("GPL"); 31MODULE_LICENSE("GPL");
32 32
33static unsigned int debug = 0; 33static unsigned int debug;
34module_param(debug, int, 0644); 34module_param(debug, int, 0644);
35MODULE_PARM_DESC(debug,"enable debug messages"); 35MODULE_PARM_DESC(debug,"enable debug messages");
36 36
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index 5266ecc91dab..3de3c8920175 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -33,7 +33,7 @@
33#define MAGIC_CHECK(is,should) if (unlikely((is) != (should))) \ 33#define MAGIC_CHECK(is,should) if (unlikely((is) != (should))) \
34 { printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); } 34 { printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); }
35 35
36static int debug = 0; 36static int debug;
37module_param(debug, int, 0644); 37module_param(debug, int, 0644);
38 38
39MODULE_DESCRIPTION("helper module to manage video4linux vmalloc buffers"); 39MODULE_DESCRIPTION("helper module to manage video4linux vmalloc buffers");
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index 87951ec8254f..b30b6b2a9a85 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -44,7 +44,7 @@
44 44
45#include "videocodec.h" 45#include "videocodec.h"
46 46
47static int debug = 0; 47static int debug;
48module_param(debug, int, 0); 48module_param(debug, int, 0);
49MODULE_PARM_DESC(debug, "Debug level (0-4)"); 49MODULE_PARM_DESC(debug, "Debug level (0-4)");
50 50
@@ -325,7 +325,7 @@ videocodec_unregister (const struct videocodec *codec)
325/* ============ */ 325/* ============ */
326 326
327static char *videocodec_buf = NULL; 327static char *videocodec_buf = NULL;
328static int videocodec_bufsize = 0; 328static int videocodec_bufsize;
329 329
330static int 330static int
331videocodec_build_table (void) 331videocodec_build_table (void)
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 5bb75294b5aa..d545c98dd5e7 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -333,7 +333,7 @@ struct vino_settings {
333 * 333 *
334 * Use non-zero value to enable conversion. 334 * Use non-zero value to enable conversion.
335 */ 335 */
336static int vino_pixel_conversion = 0; 336static int vino_pixel_conversion;
337 337
338module_param_named(pixelconv, vino_pixel_conversion, int, 0); 338module_param_named(pixelconv, vino_pixel_conversion, int, 0);
339 339
@@ -4370,8 +4370,8 @@ static int vino_ioctl(struct inode *inode, struct file *file,
4370 4370
4371/* Initialization and cleanup */ 4371/* Initialization and cleanup */
4372 4372
4373// __initdata 4373/* __initdata */
4374static int vino_init_stage = 0; 4374static int vino_init_stage;
4375 4375
4376static const struct file_operations vino_fops = { 4376static const struct file_operations vino_fops = {
4377 .owner = THIS_MODULE, 4377 .owner = THIS_MODULE,
@@ -4385,8 +4385,8 @@ static const struct file_operations vino_fops = {
4385 4385
4386static struct video_device v4l_device_template = { 4386static struct video_device v4l_device_template = {
4387 .name = "NOT SET", 4387 .name = "NOT SET",
4388 //.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | 4388 /*.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | */
4389 // VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY 4389 /* VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY */
4390 .fops = &vino_fops, 4390 .fops = &vino_fops,
4391 .minor = -1, 4391 .minor = -1,
4392}; 4392};
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index a9133858e913..35293029da02 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -40,7 +40,7 @@
40#define I2C_VPX3220 0x86 40#define I2C_VPX3220 0x86
41#define VPX3220_DEBUG KERN_DEBUG "vpx3220: " 41#define VPX3220_DEBUG KERN_DEBUG "vpx3220: "
42 42
43static int debug = 0; 43static int debug;
44module_param(debug, int, 0); 44module_param(debug, int, 0);
45MODULE_PARM_DESC(debug, "Debug level (0-1)"); 45MODULE_PARM_DESC(debug, "Debug level (0-1)");
46 46
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 08aaae07c7e0..cc8c8246c30e 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -61,7 +61,7 @@
61#include <media/v4l2-common.h> 61#include <media/v4l2-common.h>
62#include <linux/parport.h> 62#include <linux/parport.h>
63 63
64//#define DEBUG // Undef me for production 64/*#define DEBUG*/ /* Undef me for production */
65 65
66#ifdef DEBUG 66#ifdef DEBUG
67#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__ , ##a) 67#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__ , ##a)
@@ -134,7 +134,7 @@ MODULE_PARM_DESC(pardev, "pardev: where to search for\n\
134\tEg: >pardev=parport3,aggressive,parport2,parport1< would assign\n\ 134\tEg: >pardev=parport3,aggressive,parport2,parport1< would assign\n\
135\tcam 1 to parport3 and search every parport for cam 2 etc..."); 135\tcam 1 to parport3 and search every parport for cam 2 etc...");
136 136
137static int parmode = 0; 137static int parmode;
138module_param(parmode, int, 0); 138module_param(parmode, int, 0);
139MODULE_PARM_DESC(parmode, "parmode: transfer mode (0=auto, 1=ecp, 2=epp"); 139MODULE_PARM_DESC(parmode, "parmode: transfer mode (0=auto, 1=ecp, 2=epp");
140 140
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 2ae1430f5f7d..cce23d24e6fc 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -3481,7 +3481,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
3481 enum w9968cf_model_id mod_id; 3481 enum w9968cf_model_id mod_id;
3482 struct list_head* ptr; 3482 struct list_head* ptr;
3483 u8 sc = 0; /* number of simultaneous cameras */ 3483 u8 sc = 0; /* number of simultaneous cameras */
3484 static unsigned short dev_nr = 0; /* we are handling device number n */ 3484 static unsigned short dev_nr; /* 0 - we are handling device number n */
3485 3485
3486 if (le16_to_cpu(udev->descriptor.idVendor) == winbond_id_table[0].idVendor && 3486 if (le16_to_cpu(udev->descriptor.idVendor) == winbond_id_table[0].idVendor &&
3487 le16_to_cpu(udev->descriptor.idProduct) == winbond_id_table[0].idProduct) 3487 le16_to_cpu(udev->descriptor.idProduct) == winbond_id_table[0].idProduct)
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 2c5665c82442..af357cbcb9bb 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -1939,7 +1939,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
1939{ 1939{
1940 struct usb_device *udev = interface_to_usbdev(intf); 1940 struct usb_device *udev = interface_to_usbdev(intf);
1941 struct zc0301_device* cam; 1941 struct zc0301_device* cam;
1942 static unsigned int dev_nr = 0; 1942 static unsigned int dev_nr;
1943 unsigned int i; 1943 unsigned int i;
1944 int err = 0; 1944 int err = 0;
1945 1945
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 690281bb59ee..006d48847e24 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -83,7 +83,7 @@ MODULE_PARM_DESC(decoder, "i2c TV decoder");
83 or set in in a VIDIOCSFBUF ioctl 83 or set in in a VIDIOCSFBUF ioctl
84 */ 84 */
85 85
86static unsigned long vidmem = 0; /* Video memory base address */ 86static unsigned long vidmem; /* default = 0 - Video memory base address */
87module_param(vidmem, ulong, 0444); 87module_param(vidmem, ulong, 0444);
88MODULE_PARM_DESC(vidmem, "Default video memory base address"); 88MODULE_PARM_DESC(vidmem, "Default video memory base address");
89 89
@@ -91,7 +91,7 @@ MODULE_PARM_DESC(vidmem, "Default video memory base address");
91 Default input and video norm at startup of the driver. 91 Default input and video norm at startup of the driver.
92*/ 92*/
93 93
94static unsigned int default_input = 0; /* 0=Composite, 1=S-Video */ 94static unsigned int default_input; /* default 0 = Composite, 1 = S-Video */
95module_param(default_input, uint, 0444); 95module_param(default_input, uint, 0444);
96MODULE_PARM_DESC(default_input, 96MODULE_PARM_DESC(default_input,
97 "Default input (0=Composite, 1=S-Video, 2=Internal)"); 97 "Default input (0=Composite, 1=S-Video, 2=Internal)");
@@ -101,7 +101,7 @@ module_param(default_mux, int, 0644);
101MODULE_PARM_DESC(default_mux, 101MODULE_PARM_DESC(default_mux,
102 "Default 6 Eyes mux setting (Input selection)"); 102 "Default 6 Eyes mux setting (Input selection)");
103 103
104static int default_norm = 0; /* 0=PAL, 1=NTSC 2=SECAM */ 104static int default_norm; /* default 0 = PAL, 1 = NTSC 2 = SECAM */
105module_param(default_norm, int, 0444); 105module_param(default_norm, int, 0444);
106MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)"); 106MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)");
107 107
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index f97c20692057..10686c68a65b 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -60,7 +60,8 @@
60 60
61extern const struct zoran_format zoran_formats[]; 61extern const struct zoran_format zoran_formats[];
62 62
63static int lml33dpath = 0; /* 1 will use digital path in capture 63static int lml33dpath; /* default = 0
64 * 1 will use digital path in capture
64 * mode instead of analog. It can be 65 * mode instead of analog. It can be
65 * used for picture adjustments using 66 * used for picture adjustments using
66 * tool like xawtv while watching image 67 * tool like xawtv while watching image
@@ -987,7 +988,7 @@ void
987zr36057_enable_jpg (struct zoran *zr, 988zr36057_enable_jpg (struct zoran *zr,
988 enum zoran_codec_mode mode) 989 enum zoran_codec_mode mode)
989{ 990{
990 static int zero = 0; 991 static int zero;
991 static int one = 1; 992 static int one = 1;
992 struct vfe_settings cap; 993 struct vfe_settings cap;
993 int field_size = 994 int field_size =
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index fea4946ee713..5cca61cb8ba8 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -205,7 +205,7 @@ extern int jpg_nbufs;
205extern int jpg_bufsize; 205extern int jpg_bufsize;
206extern int pass_through; 206extern int pass_through;
207 207
208static int lock_norm = 0; /* 1=Don't change TV standard (norm) */ 208static int lock_norm; /* 0 = default 1 = Don't change TV standard (norm) */
209module_param(lock_norm, int, 0644); 209module_param(lock_norm, int, 0644);
210MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)"); 210MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)");
211 211
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zr36016.c
index dd084555da8f..00d132bcd1e4 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zr36016.c
@@ -55,11 +55,10 @@
55#define MAX_CODECS 20 55#define MAX_CODECS 20
56 56
57/* amount of chips attached via this driver */ 57/* amount of chips attached via this driver */
58static int zr36016_codecs = 0; 58static int zr36016_codecs;
59 59
60/* debugging is available via module parameter */ 60/* debugging is available via module parameter */
61 61static int debug;
62static int debug = 0;
63module_param(debug, int, 0); 62module_param(debug, int, 0);
64MODULE_PARM_DESC(debug, "Debug level (0-4)"); 63MODULE_PARM_DESC(debug, "Debug level (0-4)");
65 64
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c
index faae4ec3ea0b..cf8b271a1c8f 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zr36050.c
@@ -52,11 +52,10 @@
52#define MAX_CODECS 20 52#define MAX_CODECS 20
53 53
54/* amount of chips attached via this driver */ 54/* amount of chips attached via this driver */
55static int zr36050_codecs = 0; 55static int zr36050_codecs;
56 56
57/* debugging is available via module parameter */ 57/* debugging is available via module parameter */
58 58static int debug;
59static int debug = 0;
60module_param(debug, int, 0); 59module_param(debug, int, 0);
61MODULE_PARM_DESC(debug, "Debug level (0-4)"); 60MODULE_PARM_DESC(debug, "Debug level (0-4)");
62 61
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index 7849b65969d0..8e74054d5ef1 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -52,14 +52,14 @@
52#define MAX_CODECS 20 52#define MAX_CODECS 20
53 53
54/* amount of chips attached via this driver */ 54/* amount of chips attached via this driver */
55static int zr36060_codecs = 0; 55static int zr36060_codecs;
56 56
57static int low_bitrate = 0; 57static int low_bitrate;
58module_param(low_bitrate, bool, 0); 58module_param(low_bitrate, bool, 0);
59MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate"); 59MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate");
60 60
61/* debugging is available via module parameter */ 61/* debugging is available via module parameter */
62static int debug = 0; 62static int debug;
63module_param(debug, int, 0); 63module_param(debug, int, 0);
64MODULE_PARM_DESC(debug, "Debug level (0-4)"); 64MODULE_PARM_DESC(debug, "Debug level (0-4)");
65 65
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 04949c823654..a0e49dc66301 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -62,8 +62,8 @@
62 62
63 63
64/* Module parameters */ 64/* Module parameters */
65static int debug = 0; 65static int debug;
66static int mode = 0; 66static int mode;
67 67
68 68
69/* Module parameters interface */ 69/* Module parameters interface */