diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-12 00:41:36 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-12 00:41:36 +0000 |
| commit | 665b8c6f4708781640d1d250563abfd104a1a5ee (patch) | |
| tree | 4ecf10d8a4018afc000010a27660372f08f17e57 /linux/drivers/media/video/cx25840/cx25840-core.c | |
| parent | 9985093e2b4f19b1d13d5004346f22540c92cc5d (diff) | |
| download | mediapointer-dvb-s2-665b8c6f4708781640d1d250563abfd104a1a5ee.tar.gz mediapointer-dvb-s2-665b8c6f4708781640d1d250563abfd104a1a5ee.tar.bz2 | |
debug renamed to cx25840_debug
From: Hans Verkuil <hverkuil@xs4all.nl>
- debug var renamed to cx25840 to avoid conflicts with other
var with the same name at kernel
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index 563bea370..506479c3c 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -50,12 +50,12 @@ static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif -int debug = 0; +int cx25840_debug = 0; #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) -module_param(debug, bool, 0644); +module_param_named(debug,cx25840_debug, int, 0644); #else -MODULE_PARM(debug, "i"); +MODULE_PARM(cx25840_debug, "i"); #endif MODULE_PARM_DESC(debug, "Debugging messages [0=Off (default) 1=On]"); @@ -276,7 +276,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp vid_input <= CX25840_COMPOSITE8); u8 reg; - v4l_dbg(1, debug, client, "decoder set video input %d, audio input %d\n", + v4l_dbg(1, cx25840_debug, client, "decoder set video input %d, audio input %d\n", vid_input, aud_input); if (is_composite) { @@ -544,7 +544,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) else filter = 3; - v4l_dbg(1, debug, client, "decoder set size %dx%d -> scale %ux%u\n", + v4l_dbg(1, cx25840_debug, client, "decoder set size %dx%d -> scale %ux%u\n", pix->width, pix->height, HSC, VSC); /* HSCALE=HSC */ @@ -698,13 +698,13 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, return cx25840_audio(client, cmd, arg); case VIDIOC_STREAMON: - v4l_dbg(1, debug, client, "enable output\n"); + v4l_dbg(1, cx25840_debug, client, "enable output\n"); cx25840_write(client, 0x115, 0x8c); cx25840_write(client, 0x116, 0x07); break; case VIDIOC_STREAMOFF: - v4l_dbg(1, debug, client, "disable output\n"); + v4l_dbg(1, cx25840_debug, client, "disable output\n"); cx25840_write(client, 0x115, 0x00); cx25840_write(client, 0x116, 0x00); break; @@ -892,7 +892,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address, #endif snprintf(client->name, sizeof(client->name) - 1, "cx25840"); - v4l_dbg(1, debug, client, "detecting cx25840 client on address 0x%x\n", address << 1); + v4l_dbg(1, cx25840_debug, client, "detecting cx25840 client on address 0x%x\n", address << 1); device_id = cx25840_read(client, 0x101) << 8; device_id |= cx25840_read(client, 0x100); @@ -900,7 +900,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address, /* The high byte of the device ID should be * 0x84 if chip is present */ if ((device_id & 0xff00) != 0x8400) { - v4l_dbg(1, debug, client, "cx25840 not found\n"); + v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n"); kfree(client); return 0; } |