Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / media / common / saa7146_hlp.c

diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index c9c6e9a6c31d30e187ef38b480d0a46a226f1803..bc1f545c95cb2b669cae45a7e59bfe268e4d2844 100644 (file)
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <media/saa7146_vv.h>
@@ -712,8 +714,8 @@ static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa71
 
        int depth = sfmt->depth;
 
-       DEB_CAP(("[size=%dx%d,fields=%s]\n",
-               width,height,v4l2_field_names[field]));
+       DEB_CAP("[size=%dx%d,fields=%s]\n",
+               width, height, v4l2_field_names[field]);
 
        if( bytesperline != 0) {
                vdma1.pitch = bytesperline*2;
@@ -838,8 +840,8 @@ static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa71
        BUG_ON(0 == buf->pt[1].dma);
        BUG_ON(0 == buf->pt[2].dma);
 
-       DEB_CAP(("[size=%dx%d,fields=%s]\n",
-               width,height,v4l2_field_names[field]));
+       DEB_CAP("[size=%dx%d,fields=%s]\n",
+               width, height, v4l2_field_names[field]);
 
        /* fixme: look at bytesperline! */
 
@@ -999,12 +1001,12 @@ void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struc
        struct saa7146_vv *vv = dev->vv_data;
        u32 vdma1_prot_addr;
 
-       DEB_CAP(("buf:%p, next:%p\n",buf,next));
+       DEB_CAP("buf:%p, next:%p\n", buf, next);
 
        vdma1_prot_addr = saa7146_read(dev, PROT_ADDR1);
        if( 0 == vdma1_prot_addr ) {
                /* clear out beginning of streaming bit (rps register 0)*/
-               DEB_CAP(("forcing sync to new frame\n"));
+               DEB_CAP("forcing sync to new frame\n");
                saa7146_write(dev, MC2, MASK_27 );
        }