Fix comment style and set default debug level to 0

From: Hans Verkuil <hverkuil@xs4all.nl>

Convert the '//' comments to kernel approved /* */ style comments.
Set the default debug level to 0. As a result of which change some
DEBUG_WARNs to errors or remove them altogether.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

1 files changed, 22 insertions, 22 deletions

diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c
index 60fdefd02..dad36fb9c 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.c
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.c
@@ -119,7 +119,7 @@ static int ivtv_yuv_mode = 0;
 static int ivtv_yuv_threshold=480;
 static int ivtv_pci_latency = 1;
 
-int ivtv_debug = IVTV_DBGFLG_WARN;
+int ivtv_debug = 0;
 
 int newi2c = -1;
 
@@ -336,9 +336,9 @@ static void ivtv_process_eeprom(struct ivtv *itv)
 	/* Many thanks to Steven Toth from Hauppauge for providing the
 	   model numbers */
 	switch (tv.model) {
-		// In a few cases the PCI subsystem IDs do not correctly
-		// identify the card. A better method is to check the
-		// model number from the eeprom instead.
+		/* In a few cases the PCI subsystem IDs do not correctly
+		   identify the card. A better method is to check the
+		   model number from the eeprom instead. */
 		case 32000 ... 32999:
 		case 48000 ... 48099:  /* 48??? range are PVR250s with a cx23415 */
 		case 48400 ... 48599:
@@ -433,7 +433,7 @@ static void ivtv_process_eeprom(struct ivtv *itv)
 	}
 
 	if (itv->std != 0)
-		// user specified tuner standard
+		/* user specified tuner standard */
 		return;
 
 	/* autodetect tuner standard */
@@ -685,8 +685,8 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
 	return 0;
 }
 
-// Second initialization part. Here the card type has been
-// autodetected.
+/* Second initialization part. Here the card type has been
+   autodetected. */
 static void __devinit ivtv_init_struct2(struct ivtv *itv)
 {
 	int i;
@@ -709,9 +709,9 @@ static void __devinit ivtv_init_struct2(struct ivtv *itv)
 		itv->digitizer = 0x140;
 
 	if (itv->card->hw_all & IVTV_HW_CX25840) {
-		itv->vbi.sliced_size = 288;  // multiple of 16, real size = 284
+		itv->vbi.sliced_size = 288;  /* multiple of 16, real size = 284 */
 	} else {
-		itv->vbi.sliced_size = 64;   // multiple of 16, real size = 52
+		itv->vbi.sliced_size = 64;   /* multiple of 16, real size = 52 */
 	}
 
 	/* Find tuner input */
@@ -1077,8 +1077,8 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
 #ifdef CONFIG_VIDEO_TVEEPROM_MODULE
 		ivtv_request_module(itv, "tveeprom");
 #endif
-		// Based on the model number the cardtype may be changed.
-		// The PCI IDs are not always reliable.
+		/* Based on the model number the cardtype may be changed.
+		   The PCI IDs are not always reliable. */
 		ivtv_process_eeprom(itv);
 	}
 
@@ -1104,8 +1104,8 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
 	if (itv->options.radio == -1)
 		itv->options.radio = (itv->card->radio_input.audio_type != 0);
 
-	// The card is now fully identified, continue with card-specific
-	// initialization.
+	/* The card is now fully identified, continue with card-specific
+	   initialization. */
 	ivtv_init_struct2(itv);
 
 	ivtv_load_and_init_modules(itv);
@@ -1131,14 +1131,14 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
 	/* Setup VBI Raw Size. Should be big enough to hold PAL.
 	   It is possible to switch between PAL and NTSC, so we need to
 	   take the largest size here. */
-	// 1456 is multiple of 16, real size = 1444
+	/* 1456 is multiple of 16, real size = 1444 */
 	itv->vbi.raw_size = 1456;
-	// We use a buffer size of 1/2 of the total size needed for a
-	// frame. This is actually very useful, since we now receive
-	// a field at a time and that makes 'compressing' the raw data
-	// down to size by stripping off the SAV codes a lot easier.
-	// Note: having two different buffer sizes prevents standard
-	// switching on the fly. We need to find a better solution...
+	/* We use a buffer size of 1/2 of the total size needed for a
+	   frame. This is actually very useful, since we now receive
+	   a field at a time and that makes 'compressing' the raw data
+	   down to size by stripping off the SAV codes a lot easier.
+	   Note: having two different buffer sizes prevents standard
+	   switching on the fly. We need to find a better solution... */
 	vbi_buf_size = itv->vbi.raw_size * (itv->is_60hz ? 24 : 36) / 2;
 	itv->stream_buf_size[IVTV_ENC_STREAM_TYPE_VBI] = vbi_buf_size;
 	itv->stream_buf_size[IVTV_DEC_STREAM_TYPE_VBI] = sizeof(struct v4l2_sliced_vbi_data) * 36;
@@ -1220,7 +1220,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
 
 	/* Let the VIDIOC_S_STD ioctl do all the work, keeps the code
 	   in one place. */
-	itv->std++;		// Force full standard initialization
+	itv->std++;		/* Force full standard initialization */
 	itv->std_out = itv->std;
 	ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_STD, &itv->tuner_std);
 	ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_FREQUENCY, &vf);
@@ -1344,7 +1344,7 @@ static int module_start(void)
 	}
 
 	if (ivtv_debug < 0 || ivtv_debug > 511) {
-		ivtv_debug = 1;
+		ivtv_debug = 0;
 		printk(KERN_INFO "ivtv:  debug value must be >= 0 and <= 511!\n");
 	}