Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6: (28 commits)
  eth1394: replace __constant_htons by htons
  ieee1394: adjust code formatting in highlevel.c
  ieee1394: hl_irqs_lock is taken in hardware interrupt context
  ieee1394_core: switch to kthread API
  ieee1394: sbp2: Kconfig fix
  ieee1394: add preprocessor constant for invalid csr address
  sbp2: fix deregistration of status fifo address space
  [PATCH] eth1394: endian fixes
  Fix broken suspend/resume in ohci1394
  sbp2: use __attribute__((packed)) for on-the-wire structures
  sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental
  Update feature removal of obsolete raw1394 ISO requests.
  sbp2: fix S800 transfers if phys_dma is off
  sbp2: remove ohci1394 specific constant
  ohci1394: make phys_dma parameter read-only
  ohci1394: set address range properties
  ieee1394: extend lowlevel API for address range properties
  sbp2: log number of supported concurrent logins
  sbp2: remove manipulation of inquiry response
  ieee1394: save RAM by using a single tlabel for broadcast transactions
  ...

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,
 
         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",
               (type == OHCI_ISO_RECEIVE) ? "receive" : "transmit",
               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 {
                         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)(ohci->ISO_channel_usage>>32),
                         (u32)(ohci->ISO_channel_usage&0xffffffff));
@@ -805,7 +805,7 @@ static int __video1394_ioctl(struct file *file,
                         v.buf_size = d->buf_size;
                         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",
                               d->ctx, v.channel);
                 }
@@ -828,7 +828,7 @@ static int __video1394_ioctl(struct file *file,
 
                         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,
                               v.channel);
                 }
@@ -873,7 +873,7 @@ static int __video1394_ioctl(struct file *file,
                         d = find_ctx(&ctx->context_list, OHCI_ISO_TRANSMIT, channel);
 
                 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);
                 free_dma_iso_ctx(d);
 
@@ -935,7 +935,7 @@ static int __video1394_ioctl(struct file *file,
                 else {
                         /* Wake up dma context if necessary */
                         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);
                                 reg_write(ohci, d->ctrlSet, 0x1000);
                         }
@@ -1106,7 +1106,7 @@ static int __video1394_ioctl(struct file *file,
                 else {
                         /* Wake up dma context if necessary */
                         if (!(reg_read(ohci, d->ctrlSet) & 0x400)) {
-                                PRINT(KERN_INFO, ohci->host->id,
+                                DBGMSG(ohci->host->id,
                                       "Waking up iso transmit dma ctx=%d",
                                       d->ctx);
                                 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);
                 else
                         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->type == OHCI_ISO_RECEIVE ? "receive" : "transmit",
                       d->ctx, d->channel);