소스 검색

video1394: be quiet

When working with multiple cameras and intensive applications, our logs
get flooded with video1394 information which isn't of much interest.

Any objections to demoting these messages to debug messages?

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Ben Collins 19 년 전
부모
커밋
f54b1bdff1
1개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 8 8
      drivers/ieee1394/video1394.c

+ 8 - 8
drivers/ieee1394/video1394.c

@@ -331,7 +331,7 @@ alloc_dma_iso_ctx(struct ti_ohci *ohci, int type, int num_desc,
 
 
         spin_lock_init(&d->lock);
         spin_lock_init(&d->lock);
 
 
-	PRINT(KERN_INFO, ohci->host->id, "Iso %s DMA: %d buffers "
+	DBGMSG(ohci->host->id, "Iso %s DMA: %d buffers "
 	      "of size %d allocated for a frame size %d, each with %d prgs",
 	      "of size %d allocated for a frame size %d, each with %d prgs",
 	      (type == OHCI_ISO_RECEIVE) ? "receive" : "transmit",
 	      (type == OHCI_ISO_RECEIVE) ? "receive" : "transmit",
 	      d->num_desc - 1, d->buf_size, d->frame_size, d->nb_cmd);
 	      d->num_desc - 1, d->buf_size, d->frame_size, d->nb_cmd);
@@ -759,7 +759,7 @@ static int __video1394_ioctl(struct file *file,
 		} else {
 		} else {
 			mask = (u64)0x1<<v.channel;
 			mask = (u64)0x1<<v.channel;
 		}
 		}
-		PRINT(KERN_INFO, ohci->host->id, "mask: %08X%08X usage: %08X%08X\n",
+		DBGMSG(ohci->host->id, "mask: %08X%08X usage: %08X%08X\n",
 			(u32)(mask>>32),(u32)(mask&0xffffffff),
 			(u32)(mask>>32),(u32)(mask&0xffffffff),
 			(u32)(ohci->ISO_channel_usage>>32),
 			(u32)(ohci->ISO_channel_usage>>32),
 			(u32)(ohci->ISO_channel_usage&0xffffffff));
 			(u32)(ohci->ISO_channel_usage&0xffffffff));
@@ -805,7 +805,7 @@ static int __video1394_ioctl(struct file *file,
 			v.buf_size = d->buf_size;
 			v.buf_size = d->buf_size;
 			list_add_tail(&d->link, &ctx->context_list);
 			list_add_tail(&d->link, &ctx->context_list);
 
 
-			PRINT(KERN_INFO, ohci->host->id,
+			DBGMSG(ohci->host->id,
 			      "iso context %d listen on channel %d",
 			      "iso context %d listen on channel %d",
 			      d->ctx, v.channel);
 			      d->ctx, v.channel);
 		}
 		}
@@ -828,7 +828,7 @@ static int __video1394_ioctl(struct file *file,
 
 
 			list_add_tail(&d->link, &ctx->context_list);
 			list_add_tail(&d->link, &ctx->context_list);
 
 
-			PRINT(KERN_INFO, ohci->host->id,
+			DBGMSG(ohci->host->id,
 			      "Iso context %d talk on channel %d", d->ctx,
 			      "Iso context %d talk on channel %d", d->ctx,
 			      v.channel);
 			      v.channel);
 		}
 		}
@@ -873,7 +873,7 @@ static int __video1394_ioctl(struct file *file,
 			d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, channel);
 			d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, channel);
 
 
 		if (d == NULL) return -ESRCH;
 		if (d == NULL) return -ESRCH;
-		PRINT(KERN_INFO, ohci->host->id, "Iso context %d "
+		DBGMSG(ohci->host->id, "Iso context %d "
 		      "stop talking on channel %d", d->ctx, channel);
 		      "stop talking on channel %d", d->ctx, channel);
 		free_dma_iso_ctx(d);
 		free_dma_iso_ctx(d);
 
 
@@ -935,7 +935,7 @@ static int __video1394_ioctl(struct file *file,
 		else {
 		else {
 			/* Wake up dma context if necessary */
 			/* Wake up dma context if necessary */
 			if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
 			if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
-				PRINT(KERN_INFO, ohci->host->id,
+				DBGMSG(ohci->host->id,
 				      "Waking up iso dma ctx=%d", d->ctx);
 				      "Waking up iso dma ctx=%d", d->ctx);
 				reg_write(ohci, d->ctrlSet, 0x1000);
 				reg_write(ohci, d->ctrlSet, 0x1000);
 			}
 			}
@@ -1106,7 +1106,7 @@ static int __video1394_ioctl(struct file *file,
 		else {
 		else {
 			/* Wake up dma context if necessary */
 			/* Wake up dma context if necessary */
 			if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
 			if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
-				PRINT(KERN_INFO, ohci->host->id,
+				DBGMSG(ohci->host->id,
 				      "Waking up iso transmit dma ctx=%d",
 				      "Waking up iso transmit dma ctx=%d",
 				      d->ctx);
 				      d->ctx);
 				put_timestamp(ohci, d, d->last_buffer);
 				put_timestamp(ohci, d, d->last_buffer);
@@ -1232,7 +1232,7 @@ static int video1394_release(struct inode *inode, struct file *file)
 			      "is not being used", d->channel);
 			      "is not being used", d->channel);
 		else
 		else
 			ohci->ISO_channel_usage &= ~mask;
 			ohci->ISO_channel_usage &= ~mask;
-		PRINT(KERN_INFO, ohci->host->id, "On release: Iso %s context "
+		DBGMSG(ohci->host->id, "On release: Iso %s context "
 		      "%d stop listening on channel %d",
 		      "%d stop listening on channel %d",
 		      d->type == OHCI_ISO_RECEIVE ? "receive" : "transmit",
 		      d->type == OHCI_ISO_RECEIVE ? "receive" : "transmit",
 		      d->ctx, d->channel);
 		      d->ctx, d->channel);