diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-08 22:20:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:59 -0400 |
commit | 32d83efc1c9e290b3d4627c6ec40529eafa89b46 (patch) | |
tree | 8eeeaa783d50984fe038729afd9d243f94921ff7 /drivers/media/video/cx88/cx88-mpeg.c | |
parent | 22b4e64f0a119e94090ef45285a5c311f1f6855f (diff) |
V4L/DVB (7521): media/video/cx88 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-mpeg.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index 6467ca336142..a6b061c2644a 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -146,7 +146,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev, | |||
146 | cx_write(TS_GEN_CNTRL, 0x06); /* punctured clock TS & posedge driven */ | 146 | cx_write(TS_GEN_CNTRL, 0x06); /* punctured clock TS & posedge driven */ |
147 | udelay(100); | 147 | udelay(100); |
148 | } else { | 148 | } else { |
149 | printk( "%s() Failed. Unsupported value in .mpeg (0x%08x)\n", __FUNCTION__, | 149 | printk( "%s() Failed. Unsupported value in .mpeg (0x%08x)\n", __func__, |
150 | core->board.mpeg ); | 150 | core->board.mpeg ); |
151 | return -EINVAL; | 151 | return -EINVAL; |
152 | } | 152 | } |
@@ -247,7 +247,7 @@ int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev, | |||
247 | struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); | 247 | struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); |
248 | int rc; | 248 | int rc; |
249 | 249 | ||
250 | dprintk(1, "%s: %p\n", __FUNCTION__, buf); | 250 | dprintk(1, "%s: %p\n", __func__, buf); |
251 | if (0 != buf->vb.baddr && buf->vb.bsize < size) | 251 | if (0 != buf->vb.baddr && buf->vb.bsize < size) |
252 | return -EINVAL; | 252 | return -EINVAL; |
253 | 253 | ||
@@ -289,7 +289,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf) | |||
289 | buf->count = cx88q->count++; | 289 | buf->count = cx88q->count++; |
290 | mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT); | 290 | mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT); |
291 | dprintk(1,"[%p/%d] %s - first active\n", | 291 | dprintk(1,"[%p/%d] %s - first active\n", |
292 | buf, buf->vb.i, __FUNCTION__); | 292 | buf, buf->vb.i, __func__); |
293 | 293 | ||
294 | } else { | 294 | } else { |
295 | dprintk( 1, "queue is not empty - append to active\n" ); | 295 | dprintk( 1, "queue is not empty - append to active\n" ); |
@@ -299,7 +299,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf) | |||
299 | buf->count = cx88q->count++; | 299 | buf->count = cx88q->count++; |
300 | prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); | 300 | prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); |
301 | dprintk( 1, "[%p/%d] %s - append to active\n", | 301 | dprintk( 1, "[%p/%d] %s - append to active\n", |
302 | buf, buf->vb.i, __FUNCTION__); | 302 | buf, buf->vb.i, __func__); |
303 | } | 303 | } |
304 | } | 304 | } |
305 | 305 | ||
@@ -342,7 +342,7 @@ static void cx8802_timeout(unsigned long data) | |||
342 | { | 342 | { |
343 | struct cx8802_dev *dev = (struct cx8802_dev*)data; | 343 | struct cx8802_dev *dev = (struct cx8802_dev*)data; |
344 | 344 | ||
345 | dprintk(1, "%s\n",__FUNCTION__); | 345 | dprintk(1, "%s\n",__func__); |
346 | 346 | ||
347 | if (debug) | 347 | if (debug) |
348 | cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]); | 348 | cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]); |
@@ -625,7 +625,7 @@ static int cx8802_request_acquire(struct cx8802_driver *drv) | |||
625 | } | 625 | } |
626 | mutex_unlock(&drv->core->lock); | 626 | mutex_unlock(&drv->core->lock); |
627 | 627 | ||
628 | mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); | 628 | mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __func__, cx_read(MO_GP0_IO)); |
629 | } | 629 | } |
630 | 630 | ||
631 | return 0; | 631 | return 0; |
@@ -641,7 +641,7 @@ static int cx8802_request_release(struct cx8802_driver *drv) | |||
641 | { | 641 | { |
642 | drv->advise_release(drv); | 642 | drv->advise_release(drv); |
643 | core->active_type_id = CX88_BOARD_NONE; | 643 | core->active_type_id = CX88_BOARD_NONE; |
644 | mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); | 644 | mpeg_dbg(1,"%s() Post release GPIO=%x\n", __func__, cx_read(MO_GP0_IO)); |
645 | } | 645 | } |
646 | mutex_unlock(&drv->core->lock); | 646 | mutex_unlock(&drv->core->lock); |
647 | 647 | ||
@@ -815,7 +815,7 @@ static void __devexit cx8802_remove(struct pci_dev *pci_dev) | |||
815 | 815 | ||
816 | dev = pci_get_drvdata(pci_dev); | 816 | dev = pci_get_drvdata(pci_dev); |
817 | 817 | ||
818 | dprintk( 1, "%s\n", __FUNCTION__); | 818 | dprintk( 1, "%s\n", __func__); |
819 | 819 | ||
820 | if (!list_empty(&dev->drvlist)) { | 820 | if (!list_empty(&dev->drvlist)) { |
821 | struct cx8802_driver *drv, *tmp; | 821 | struct cx8802_driver *drv, *tmp; |