aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/video1394.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 4e3bd62c458d..295d0f8c3d06 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -331,7 +331,7 @@ alloc_dma_iso_ctx(struct ti_ohci *ohci, int type, int num_desc,
331 331
332 spin_lock_init(&d->lock); 332 spin_lock_init(&d->lock);
333 333
334 PRINT(KERN_INFO, ohci->host->id, "Iso %s DMA: %d buffers " 334 DBGMSG(ohci->host->id, "Iso %s DMA: %d buffers "
335 "of size %d allocated for a frame size %d, each with %d prgs", 335 "of size %d allocated for a frame size %d, each with %d prgs",
336 (type == OHCI_ISO_RECEIVE) ? "receive" : "transmit", 336 (type == OHCI_ISO_RECEIVE) ? "receive" : "transmit",
337 d->num_desc - 1, d->buf_size, d->frame_size, d->nb_cmd); 337 d->num_desc - 1, d->buf_size, d->frame_size, d->nb_cmd);
@@ -759,7 +759,7 @@ static int __video1394_ioctl(struct file *file,
759 } else { 759 } else {
760 mask = (u64)0x1<<v.channel; 760 mask = (u64)0x1<<v.channel;
761 } 761 }
762 PRINT(KERN_INFO, ohci->host->id, "mask: %08X%08X usage: %08X%08X\n", 762 DBGMSG(ohci->host->id, "mask: %08X%08X usage: %08X%08X\n",
763 (u32)(mask>>32),(u32)(mask&0xffffffff), 763 (u32)(mask>>32),(u32)(mask&0xffffffff),
764 (u32)(ohci->ISO_channel_usage>>32), 764 (u32)(ohci->ISO_channel_usage>>32),
765 (u32)(ohci->ISO_channel_usage&0xffffffff)); 765 (u32)(ohci->ISO_channel_usage&0xffffffff));
@@ -805,7 +805,7 @@ static int __video1394_ioctl(struct file *file,
805 v.buf_size = d->buf_size; 805 v.buf_size = d->buf_size;
806 list_add_tail(&d->link, &ctx->context_list); 806 list_add_tail(&d->link, &ctx->context_list);
807 807
808 PRINT(KERN_INFO, ohci->host->id, 808 DBGMSG(ohci->host->id,
809 "iso context %d listen on channel %d", 809 "iso context %d listen on channel %d",
810 d->ctx, v.channel); 810 d->ctx, v.channel);
811 } 811 }
@@ -828,7 +828,7 @@ static int __video1394_ioctl(struct file *file,
828 828
829 list_add_tail(&d->link, &ctx->context_list); 829 list_add_tail(&d->link, &ctx->context_list);
830 830
831 PRINT(KERN_INFO, ohci->host->id, 831 DBGMSG(ohci->host->id,
832 "Iso context %d talk on channel %d", d->ctx, 832 "Iso context %d talk on channel %d", d->ctx,
833 v.channel); 833 v.channel);
834 } 834 }
@@ -873,7 +873,7 @@ static int __video1394_ioctl(struct file *file,
873 d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, channel); 873 d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, channel);
874 874
875 if (d == NULL) return -ESRCH; 875 if (d == NULL) return -ESRCH;
876 PRINT(KERN_INFO, ohci->host->id, "Iso context %d " 876 DBGMSG(ohci->host->id, "Iso context %d "
877 "stop talking on channel %d", d->ctx, channel); 877 "stop talking on channel %d", d->ctx, channel);
878 free_dma_iso_ctx(d); 878 free_dma_iso_ctx(d);
879 879
@@ -935,7 +935,7 @@ static int __video1394_ioctl(struct file *file,
935 else { 935 else {
936 /* Wake up dma context if necessary */ 936 /* Wake up dma context if necessary */
937 if (!(reg_read(ohci, d->ctrlSet) & 0x400)) { 937 if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
938 PRINT(KERN_INFO, ohci->host->id, 938 DBGMSG(ohci->host->id,
939 "Waking up iso dma ctx=%d", d->ctx); 939 "Waking up iso dma ctx=%d", d->ctx);
940 reg_write(ohci, d->ctrlSet, 0x1000); 940 reg_write(ohci, d->ctrlSet, 0x1000);
941 } 941 }
@@ -1106,7 +1106,7 @@ static int __video1394_ioctl(struct file *file,
1106 else { 1106 else {
1107 /* Wake up dma context if necessary */ 1107 /* Wake up dma context if necessary */
1108 if (!(reg_read(ohci, d->ctrlSet) & 0x400)) { 1108 if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
1109 PRINT(KERN_INFO, ohci->host->id, 1109 DBGMSG(ohci->host->id,
1110 "Waking up iso transmit dma ctx=%d", 1110 "Waking up iso transmit dma ctx=%d",
1111 d->ctx); 1111 d->ctx);
1112 put_timestamp(ohci, d, d->last_buffer); 1112 put_timestamp(ohci, d, d->last_buffer);
@@ -1232,7 +1232,7 @@ static int video1394_release(struct inode *inode, struct file *file)
1232 "is not being used", d->channel); 1232 "is not being used", d->channel);
1233 else 1233 else
1234 ohci->ISO_channel_usage &= ~mask; 1234 ohci->ISO_channel_usage &= ~mask;
1235 PRINT(KERN_INFO, ohci->host->id, "On release: Iso %s context " 1235 DBGMSG(ohci->host->id, "On release: Iso %s context "
1236 "%d stop listening on channel %d", 1236 "%d stop listening on channel %d",
1237 d->type == OHCI_ISO_RECEIVE ? "receive" : "transmit", 1237 d->type == OHCI_ISO_RECEIVE ? "receive" : "transmit",
1238 d->ctx, d->channel); 1238 d->ctx, d->channel);