aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-08 22:20:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:59 -0400
commit645635b002311fafffd1b8f4e2e8200639fb7629 (patch)
tree68237861031d7cfb1217807d2519919e3e7aa297 /drivers/media/video/pwc
parent12aa67a63d2bf4e6500af6b2de40d18fa0bc1360 (diff)
V4L/DVB (7525): media/video/pwc 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/pwc')
-rw-r--r--drivers/media/video/pwc/pwc-if.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index d2941c5656ca..423fa7c2d0c9 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -489,7 +489,7 @@ static void pwc_reset_buffers(struct pwc_device *pdev)
489 int i; 489 int i;
490 unsigned long flags; 490 unsigned long flags;
491 491
492 PWC_DEBUG_MEMORY(">> %s __enter__\n", __FUNCTION__); 492 PWC_DEBUG_MEMORY(">> %s __enter__\n", __func__);
493 493
494 spin_lock_irqsave(&pdev->ptrlock, flags); 494 spin_lock_irqsave(&pdev->ptrlock, flags);
495 pdev->full_frames = NULL; 495 pdev->full_frames = NULL;
@@ -511,7 +511,7 @@ static void pwc_reset_buffers(struct pwc_device *pdev)
511 pdev->fill_image = 0; 511 pdev->fill_image = 0;
512 spin_unlock_irqrestore(&pdev->ptrlock, flags); 512 spin_unlock_irqrestore(&pdev->ptrlock, flags);
513 513
514 PWC_DEBUG_MEMORY("<< %s __leaving__\n", __FUNCTION__); 514 PWC_DEBUG_MEMORY("<< %s __leaving__\n", __func__);
515} 515}
516 516
517 517
@@ -1428,7 +1428,7 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
1428 unsigned long page, pos = 0; 1428 unsigned long page, pos = 0;
1429 int index; 1429 int index;
1430 1430
1431 PWC_DEBUG_MEMORY(">> %s\n", __FUNCTION__); 1431 PWC_DEBUG_MEMORY(">> %s\n", __func__);
1432 pdev = vdev->priv; 1432 pdev = vdev->priv;
1433 size = vma->vm_end - vma->vm_start; 1433 size = vma->vm_end - vma->vm_start;
1434 start = vma->vm_start; 1434 start = vma->vm_start;