[media] bt8xx: Use current logging styles

[sfrench/cifs-2.6.git] / drivers / media / video / bt8xx / bttv-risc.c

diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 9b57d091da48cede48cf7eca3e1976a96521a854..82cc47d2e3fa0e840f00d1741c17da7e7c019638 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -24,6 +24,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -473,8 +475,7 @@ bttv_set_dma(struct bttv *btv, int override)
        capctl |= (btv->cap_ctl & 0x0c) ? 0x0c : 0x00;  /* vbi data */
        capctl |= override;
 
-       d2printk(KERN_DEBUG
-                "bttv%d: capctl=%x lirq=%d top=%08Lx/%08Lx even=%08Lx/%08Lx\n",
+       d2printk("%d: capctl=%x lirq=%d top=%08llx/%08llx even=%08llx/%08llx\n",
                 btv->c.nr,capctl,btv->loop_irq,
                 btv->cvbi         ? (unsigned long long)btv->cvbi->top.dma            : 0,
                 btv->curr.top     ? (unsigned long long)btv->curr.top->top.dma        : 0,
@@ -517,8 +518,8 @@ bttv_risc_init_main(struct bttv *btv)
 
        if ((rc = btcx_riscmem_alloc(btv->c.pci,&btv->main,PAGE_SIZE)) < 0)
                return rc;
-       dprintk(KERN_DEBUG "bttv%d: risc main @ %08Lx\n",
-               btv->c.nr,(unsigned long long)btv->main.dma);
+       dprintk("%d: risc main @ %08llx\n",
+               btv->c.nr, (unsigned long long)btv->main.dma);
 
        btv->main.cpu[0] = cpu_to_le32(BT848_RISC_SYNC | BT848_RISC_RESYNC |
                                       BT848_FIFO_STATUS_VRE);
@@ -557,12 +558,12 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc,
        unsigned long next = btv->main.dma + ((slot+2) << 2);
 
        if (NULL == risc) {
-               d2printk(KERN_DEBUG "bttv%d: risc=%p slot[%d]=NULL\n",
-                        btv->c.nr,risc,slot);
+               d2printk("%d: risc=%p slot[%d]=NULL\n", btv->c.nr, risc, slot);
                btv->main.cpu[slot+1] = cpu_to_le32(next);
        } else {
-               d2printk(KERN_DEBUG "bttv%d: risc=%p slot[%d]=%08Lx irq=%d\n",
-                        btv->c.nr,risc,slot,(unsigned long long)risc->dma,irqflags);
+               d2printk("%d: risc=%p slot[%d]=%08llx irq=%d\n",
+                        btv->c.nr, risc, slot,
+                        (unsigned long long)risc->dma, irqflags);
                cmd = BT848_RISC_JUMP;
                if (irqflags) {
                        cmd |= BT848_RISC_IRQ;
@@ -708,8 +709,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
        const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm;
        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
 
-       dprintk(KERN_DEBUG
-               "bttv%d: buffer field: %s  format: %s  size: %dx%d\n",
+       dprintk("%d: buffer field: %s  format: %s  size: %dx%d\n",
                btv->c.nr, v4l2_field_names[buf->vb.field],
                buf->fmt->name, buf->vb.width, buf->vb.height);
 
@@ -870,10 +870,9 @@ bttv_overlay_risc(struct bttv *btv,
                  struct bttv_buffer *buf)
 {
        /* check interleave, bottom+top fields */
-       dprintk(KERN_DEBUG
-               "bttv%d: overlay fields: %s format: %s  size: %dx%d\n",
+       dprintk("%d: overlay fields: %s format: %s  size: %dx%d\n",
                btv->c.nr, v4l2_field_names[buf->vb.field],
-               fmt->name,ov->w.width,ov->w.height);
+               fmt->name, ov->w.width, ov->w.height);
 
        /* calculate geometry */
        bttv_calc_geo(btv,&buf->geo,ov->w.width,ov->w.height,