aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-30 07:38:02 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-13 09:09:28 -0400
commitaf5d20ceb359bcd6a76c156a99ff5100c4b05401 (patch)
tree56a5296d11f5b2d809fdc55cddeecb4d72e1a2df /drivers/media/pci/saa7134
parent30693f346e4f5c0720de66c424b38053f9e34a08 (diff)
[media] saa7134-ts: use pr_fmt() at the debug macro
instead of using dev->name, let's use pr_fmt() like on the other parts of saa7134. Also, rename the debug macro to ts_dbg() to match the namespace for the debug macros. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134')
-rw-r--r--drivers/media/pci/saa7134/saa7134-ts.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index 8a2938c34d32..5d7c4afac8e6 100644
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -35,8 +35,8 @@ static unsigned int ts_debug;
35module_param(ts_debug, int, 0644); 35module_param(ts_debug, int, 0644);
36MODULE_PARM_DESC(ts_debug,"enable debug messages [ts]"); 36MODULE_PARM_DESC(ts_debug,"enable debug messages [ts]");
37 37
38#define dprintk(fmt, arg...) if (ts_debug) \ 38#define ts_dbg(fmt, arg...) if (ts_debug) \
39 printk(KERN_DEBUG "%s/ts: " fmt, dev->name , ## arg) 39 printk(KERN_DEBUG pr_fmt("ts: " fmt), ## arg)
40 40
41/* ------------------------------------------------------------------ */ 41/* ------------------------------------------------------------------ */
42static int buffer_activate(struct saa7134_dev *dev, 42static int buffer_activate(struct saa7134_dev *dev,
@@ -44,7 +44,7 @@ static int buffer_activate(struct saa7134_dev *dev,
44 struct saa7134_buf *next) 44 struct saa7134_buf *next)
45{ 45{
46 46
47 dprintk("buffer_activate [%p]",buf); 47 ts_dbg("buffer_activate [%p]",buf);
48 buf->top_seen = 0; 48 buf->top_seen = 0;
49 49
50 if (!dev->ts_started) 50 if (!dev->ts_started)
@@ -53,12 +53,12 @@ static int buffer_activate(struct saa7134_dev *dev,
53 if (NULL == next) 53 if (NULL == next)
54 next = buf; 54 next = buf;
55 if (V4L2_FIELD_TOP == dev->ts_field) { 55 if (V4L2_FIELD_TOP == dev->ts_field) {
56 dprintk("- [top] buf=%p next=%p\n",buf,next); 56 ts_dbg("- [top] buf=%p next=%p\n",buf,next);
57 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(buf)); 57 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(buf));
58 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(next)); 58 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(next));
59 dev->ts_field = V4L2_FIELD_BOTTOM; 59 dev->ts_field = V4L2_FIELD_BOTTOM;
60 } else { 60 } else {
61 dprintk("- [bottom] buf=%p next=%p\n",buf,next); 61 ts_dbg("- [bottom] buf=%p next=%p\n",buf,next);
62 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(next)); 62 saa_writel(SAA7134_RS_BA1(5),saa7134_buffer_base(next));
63 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(buf)); 63 saa_writel(SAA7134_RS_BA2(5),saa7134_buffer_base(buf));
64 dev->ts_field = V4L2_FIELD_TOP; 64 dev->ts_field = V4L2_FIELD_TOP;
@@ -95,7 +95,7 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
95 struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0); 95 struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
96 unsigned int lines, llength, size; 96 unsigned int lines, llength, size;
97 97
98 dprintk("buffer_prepare [%p]\n", buf); 98 ts_dbg("buffer_prepare [%p]\n", buf);
99 99
100 llength = TS_PACKET_SIZE; 100 llength = TS_PACKET_SIZE;
101 lines = dev->ts.nr_packets; 101 lines = dev->ts.nr_packets;
@@ -239,7 +239,7 @@ int saa7134_ts_init1(struct saa7134_dev *dev)
239/* Function for stop TS */ 239/* Function for stop TS */
240int saa7134_ts_stop(struct saa7134_dev *dev) 240int saa7134_ts_stop(struct saa7134_dev *dev)
241{ 241{
242 dprintk("TS stop\n"); 242 ts_dbg("TS stop\n");
243 243
244 if (!dev->ts_started) 244 if (!dev->ts_started)
245 return 0; 245 return 0;
@@ -261,7 +261,7 @@ int saa7134_ts_stop(struct saa7134_dev *dev)
261/* Function for start TS */ 261/* Function for start TS */
262int saa7134_ts_start(struct saa7134_dev *dev) 262int saa7134_ts_start(struct saa7134_dev *dev)
263{ 263{
264 dprintk("TS start\n"); 264 ts_dbg("TS start\n");
265 265
266 if (WARN_ON(dev->ts_started)) 266 if (WARN_ON(dev->ts_started))
267 return 0; 267 return 0;