1 files changed, 14 insertions, 14 deletions

diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c
index d7bb76931..90e0f51e6 100644
--- a/linux/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c
@@ -46,9 +46,9 @@ int ivtv_claim_stream(struct ivtv_open_id *id, int type)
 	int vbi_type;
 
 	if (test_and_set_bit(IVTV_F_S_CLAIMED, &s->s_flags)) {
-		// someone already claimed this stream
+		/* someone already claimed this stream */
 		if (s->id == id->open_id) {
-			// yes, this file descriptor did. So that's OK.
+			/* yes, this file descriptor did. So that's OK. */
 			return 0;
 		}
 		if (s->id == -1 && (type == IVTV_DEC_STREAM_TYPE_VBI ||
@@ -66,7 +66,7 @@ int ivtv_claim_stream(struct ivtv_open_id *id, int type)
 	}
 	s->id = id->open_id;
 	if (type == IVTV_DEC_STREAM_TYPE_VBI) {
-		// Enable reinsertion interrupt
+		/* Enable reinsertion interrupt */
 		ivtv_clear_irq_mask(itv, IVTV_IRQ_DEC_VBI_RE_INSERT);
 	}
 
@@ -85,11 +85,11 @@ int ivtv_claim_stream(struct ivtv_open_id *id, int type)
 	s_vbi = &itv->streams[vbi_type];
 
 	if (!test_and_set_bit(IVTV_F_S_CLAIMED, &s_vbi->s_flags)) {
-		// Enable reinsertion interrupt
+		/* Enable reinsertion interrupt */
 		if (vbi_type == IVTV_DEC_STREAM_TYPE_VBI)
 			ivtv_clear_irq_mask(itv, IVTV_IRQ_DEC_VBI_RE_INSERT);
 	}
-	// mark that it is used internally
+	/* mark that it is used internally */
 	set_bit(IVTV_F_S_INTERNAL_USE, &s_vbi->s_flags);
 	return 0;
 }
@@ -104,7 +104,7 @@ void ivtv_release_stream(struct ivtv_stream *s)
 	s->id = -1;
 	if ((s->type == IVTV_DEC_STREAM_TYPE_VBI || s->type == IVTV_ENC_STREAM_TYPE_VBI) &&
 		test_bit(IVTV_F_S_INTERNAL_USE, &s->s_flags)) {
-		// this stream is still in use internally
+		/* this stream is still in use internally */
 		return;
 	}
 	if (!test_and_clear_bit(IVTV_F_S_CLAIMED, &s->s_flags)) {
@@ -114,7 +114,7 @@ void ivtv_release_stream(struct ivtv_stream *s)
 
 	ivtv_flush_queues(s);
 
-	// disable reinsertion interrupt
+	/* disable reinsertion interrupt */
 	if (s->type == IVTV_DEC_STREAM_TYPE_VBI)
 		ivtv_set_irq_mask(itv, IVTV_IRQ_DEC_VBI_RE_INSERT);
 
@@ -128,16 +128,16 @@ void ivtv_release_stream(struct ivtv_stream *s)
 	else
 		return;
 
-	// clear internal use flag
+	/* clear internal use flag */
 	if (!test_and_clear_bit(IVTV_F_S_INTERNAL_USE, &s_vbi->s_flags)) {
-		// was already cleared
+		/* was already cleared */
 		return;
 	}
 	if (s_vbi->id != -1) {
-		// VBI stream still claimed by a file descriptor
+		/* VBI stream still claimed by a file descriptor */
 		return;
 	}
-	// disable reinsertion interrupt
+	/* disable reinsertion interrupt */
 	if (s_vbi->type == IVTV_DEC_STREAM_TYPE_VBI)
 		ivtv_set_irq_mask(itv, IVTV_IRQ_DEC_VBI_RE_INSERT);
 	clear_bit(IVTV_F_S_CLAIMED, &s_vbi->s_flags);
@@ -776,7 +776,7 @@ int ivtv_v4l2_close(struct inode *inode, struct file *filp)
 
 	/* Stop radio */
 	if (id->type == IVTV_ENC_STREAM_TYPE_RAD) {
-		// Closing radio device, return to TV mode
+		/* Closing radio device, return to TV mode */
 		ivtv_mute(itv);
 		/* Mark that the radio is no longer in use */
 		clear_bit(IVTV_F_I_RADIO_USER, &itv->i_flags);
@@ -836,12 +836,12 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
 	if (y == IVTV_DEC_STREAM_TYPE_YUV) {
 		if (read_reg(0x82c) == 0) {
 			IVTV_ERR("Tried to open YUV output device but need to send data to mpeg decoder before it can be used\n");
-			// return -ENODEV;
+			/* return -ENODEV; */
 		}
 		ivtv_udma_alloc(itv);
 	}
 
-	// Allocate memory
+	/* Allocate memory */
 	item = kmalloc(sizeof(struct ivtv_open_id), GFP_KERNEL);
 	if (NULL == item) {
 		IVTV_DEBUG_WARN("nomem on v4l2 open\n");