tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (3348): debug renamed to cx25840_debug

- 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>

authored by Hans Verkuil and committed by Mauro Carvalho Chehab b5fc7144 f9195ded

+8 -8
unified split
+8 -8
drivers/media/video/cx25840/cx25840-core.c
··· 43 43 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END }; 44 44 45 45 46 - int debug = 0; 46 + int cx25840_debug = 0; 47 47 48 - module_param(debug, bool, 0644); 48 + module_param_named(debug,cx25840_debug, int, 0644); 49 49 50 50 MODULE_PARM_DESC(debug, "Debugging messages [0=Off (default) 1=On]"); 51 51 ··· 265 265 vid_input <= CX25840_COMPOSITE8); 266 266 u8 reg; 267 267 268 - v4l_dbg(1, debug, client, "decoder set video input %d, audio input %d\n", 268 + v4l_dbg(1, cx25840_debug, client, "decoder set video input %d, audio input %d\n", 269 269 vid_input, aud_input); 270 270 271 271 if (is_composite) { ··· 533 533 else 534 534 filter = 3; 535 535 536 - v4l_dbg(1, debug, client, "decoder set size %dx%d -> scale %ux%u\n", 536 + v4l_dbg(1, cx25840_debug, client, "decoder set size %dx%d -> scale %ux%u\n", 537 537 pix->width, pix->height, HSC, VSC); 538 538 539 539 /* HSCALE=HSC */ ··· 687 687 return cx25840_audio(client, cmd, arg); 688 688 689 689 case VIDIOC_STREAMON: 690 - v4l_dbg(1, debug, client, "enable output\n"); 690 + v4l_dbg(1, cx25840_debug, client, "enable output\n"); 691 691 cx25840_write(client, 0x115, 0x8c); 692 692 cx25840_write(client, 0x116, 0x07); 693 693 break; 694 694 695 695 case VIDIOC_STREAMOFF: 696 - v4l_dbg(1, debug, client, "disable output\n"); 696 + v4l_dbg(1, cx25840_debug, client, "disable output\n"); 697 697 cx25840_write(client, 0x115, 0x00); 698 698 cx25840_write(client, 0x116, 0x00); 699 699 break; ··· 871 871 client->driver = &i2c_driver_cx25840; 872 872 snprintf(client->name, sizeof(client->name) - 1, "cx25840"); 873 873 874 - v4l_dbg(1, debug, client, "detecting cx25840 client on address 0x%x\n", address << 1); 874 + v4l_dbg(1, cx25840_debug, client, "detecting cx25840 client on address 0x%x\n", address << 1); 875 875 876 876 device_id = cx25840_read(client, 0x101) << 8; 877 877 device_id |= cx25840_read(client, 0x100); ··· 879 879 /* The high byte of the device ID should be 880 880 * 0x84 if chip is present */ 881 881 if ((device_id & 0xff00) != 0x8400) { 882 - v4l_dbg(1, debug, client, "cx25840 not found\n"); 882 + v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n"); 883 883 kfree(client); 884 884 return 0; 885 885 }