diff options
| -rw-r--r-- | drivers/media/i2c/saa6588.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c index fb09e4560d8a..90ae4121a68a 100644 --- a/drivers/media/i2c/saa6588.c +++ b/drivers/media/i2c/saa6588.c @@ -49,8 +49,6 @@ MODULE_LICENSE("GPL"); /* ---------------------------------------------------------------------- */ #define UNSET (-1U) -#define PREFIX "saa6588: " -#define dprintk if (debug) printk struct saa6588 { struct v4l2_subdev sd; @@ -144,14 +142,14 @@ static bool block_from_buf(struct saa6588 *s, unsigned char *buf) if (s->rd_index == s->wr_index) { if (debug > 2) - dprintk(PREFIX "Read: buffer empty.\n"); + v4l2_info(&s->sd, "Read: buffer empty.\n"); return false; } if (debug > 2) { - dprintk(PREFIX "Read: "); + v4l2_info(&s->sd, "Read: "); for (i = s->rd_index; i < s->rd_index + 3; i++) - dprintk("0x%02x ", s->buffer[i]); + v4l2_info(&s->sd, "0x%02x ", s->buffer[i]); } memcpy(buf, &s->buffer[s->rd_index], 3); @@ -162,7 +160,7 @@ static bool block_from_buf(struct saa6588 *s, unsigned char *buf) s->block_count--; if (debug > 2) - dprintk("%d blocks total.\n", s->block_count); + v4l2_info(&s->sd, "%d blocks total.\n", s->block_count); return true; } @@ -222,11 +220,11 @@ static void block_to_buf(struct saa6588 *s, unsigned char *blockbuf) unsigned int i; if (debug > 3) - dprintk(PREFIX "New block: "); + v4l2_info(&s->sd, "New block: "); for (i = 0; i < 3; ++i) { if (debug > 3) - dprintk("0x%02x ", blockbuf[i]); + v4l2_info(&s->sd, "0x%02x ", blockbuf[i]); s->buffer[s->wr_index] = blockbuf[i]; s->wr_index++; } @@ -242,7 +240,7 @@ static void block_to_buf(struct saa6588 *s, unsigned char *blockbuf) s->block_count++; if (debug > 3) - dprintk("%d blocks total.\n", s->block_count); + v4l2_info(&s->sd, "%d blocks total.\n", s->block_count); } static void saa6588_i2c_poll(struct saa6588 *s) @@ -257,7 +255,7 @@ static void saa6588_i2c_poll(struct saa6588 *s) SAA6588 returns garbage otherwise. */ if (6 != i2c_master_recv(client, &tmpbuf[0], 6)) { if (debug > 1) - dprintk(PREFIX "read error!\n"); + v4l2_info(&s->sd, "read error!\n"); return; } @@ -267,7 +265,7 @@ static void saa6588_i2c_poll(struct saa6588 *s) blocknum = tmpbuf[0] >> 5; if (blocknum == s->last_blocknum) { if (debug > 3) - dprintk("Saw block %d again.\n", blocknum); + v4l2_info(&s->sd, "Saw block %d again.\n", blocknum); return; } @@ -370,12 +368,13 @@ static void saa6588_configure(struct saa6588 *s) break; } - dprintk(PREFIX "writing: 0w=0x%02x 1w=0x%02x 2w=0x%02x\n", - buf[0], buf[1], buf[2]); + if (debug) + v4l2_info(&s->sd, "writing: 0w=0x%02x 1w=0x%02x 2w=0x%02x\n", + buf[0], buf[1], buf[2]); rc = i2c_master_send(client, buf, 3); if (rc != 3) - printk(PREFIX "i2c i/o error: rc == %d (should be 3)\n", rc); + v4l2_info(&s->sd, "i2c i/o error: rc == %d (should be 3)\n", rc); } /* ---------------------------------------------------------------------- */ |