diff options
| author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 19:41:49 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 19:41:49 -0200 |
| commit | f167cb4e6ee07914b66eb85fc0bf006a409b6838 (patch) | |
| tree | 11b888db404a404a9a918c841d06d65c21bc4c19 /drivers/media/video/cx25840 | |
| parent | b2a17e47ceb82d23dbf5c5fb24b5377e21486dce (diff) | |
| download | op-kernel-dev-f167cb4e6ee07914b66eb85fc0bf006a409b6838.zip op-kernel-dev-f167cb4e6ee07914b66eb85fc0bf006a409b6838.tar.gz | |
V4L/DVB (3345): Fixes some bad global variables
- Debug global var is already used inside kernel.
- v4l_dbg now expects the debug var
- global vars inside msp34xx renamed to msp_*
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx25840')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index c173476..847b166 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -265,7 +265,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp vid_input <= CX25840_COMPOSITE8); u8 reg; - v4l_dbg(1, client, "decoder set video input %d, audio input %d\n", + v4l_dbg(1, debug, client, "decoder set video input %d, audio input %d\n", vid_input, aud_input); if (is_composite) { @@ -533,7 +533,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) else filter = 3; - v4l_dbg(1, client, "decoder set size %dx%d -> scale %ux%u\n", + v4l_dbg(1, debug, client, "decoder set size %dx%d -> scale %ux%u\n", pix->width, pix->height, HSC, VSC); /* HSCALE=HSC */ @@ -687,13 +687,13 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, return cx25840_audio(client, cmd, arg); case VIDIOC_STREAMON: - v4l_dbg(1, client, "enable output\n"); + v4l_dbg(1, debug, client, "enable output\n"); cx25840_write(client, 0x115, 0x8c); cx25840_write(client, 0x116, 0x07); break; case VIDIOC_STREAMOFF: - v4l_dbg(1, client, "disable output\n"); + v4l_dbg(1, debug, client, "disable output\n"); cx25840_write(client, 0x115, 0x00); cx25840_write(client, 0x116, 0x00); break; @@ -871,7 +871,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address, client->driver = &i2c_driver_cx25840; snprintf(client->name, sizeof(client->name) - 1, "cx25840"); - v4l_dbg(1, client, "detecting cx25840 client on address 0x%x\n", address << 1); + v4l_dbg(1, 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); @@ -879,7 +879,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, client, "cx25840 not found\n"); + v4l_dbg(1, debug, client, "cx25840 not found\n"); kfree(client); return 0; } |
