aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_camera.c
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
commit7e28adb2497f6b873516163e2d29210c11777613 (patch)
tree2f65ee1bcadb2915f196a277dbac83af99685481 /drivers/media/video/soc_camera.c
parente9815ceea9733dfb236629f5b72f2e6486f66242 (diff)
V4L/DVB (7518): media/video/ 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/soc_camera.c')
-rw-r--r--drivers/media/video/soc_camera.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 1e921578804f..91a1251d904d 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -137,7 +137,7 @@ static int soc_camera_reqbufs(struct file *file, void *priv,
137 137
138 WARN_ON(priv != file->private_data); 138 WARN_ON(priv != file->private_data);
139 139
140 dev_dbg(&icd->dev, "%s: %d\n", __FUNCTION__, p->memory); 140 dev_dbg(&icd->dev, "%s: %d\n", __func__, p->memory);
141 141
142 ret = videobuf_reqbufs(&icf->vb_vidq, p); 142 ret = videobuf_reqbufs(&icf->vb_vidq, p);
143 if (ret < 0) 143 if (ret < 0)
@@ -453,7 +453,7 @@ static int soc_camera_streamon(struct file *file, void *priv,
453 453
454 WARN_ON(priv != file->private_data); 454 WARN_ON(priv != file->private_data);
455 455
456 dev_dbg(&icd->dev, "%s\n", __FUNCTION__); 456 dev_dbg(&icd->dev, "%s\n", __func__);
457 457
458 if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE) 458 if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
459 return -EINVAL; 459 return -EINVAL;
@@ -472,7 +472,7 @@ static int soc_camera_streamoff(struct file *file, void *priv,
472 472
473 WARN_ON(priv != file->private_data); 473 WARN_ON(priv != file->private_data);
474 474
475 dev_dbg(&icd->dev, "%s\n", __FUNCTION__); 475 dev_dbg(&icd->dev, "%s\n", __func__);
476 476
477 if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE) 477 if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
478 return -EINVAL; 478 return -EINVAL;
@@ -985,7 +985,7 @@ void soc_camera_video_stop(struct soc_camera_device *icd)
985{ 985{
986 struct video_device *vdev = icd->vdev; 986 struct video_device *vdev = icd->vdev;
987 987
988 dev_dbg(&icd->dev, "%s\n", __FUNCTION__); 988 dev_dbg(&icd->dev, "%s\n", __func__);
989 989
990 if (!icd->dev.parent || !vdev) 990 if (!icd->dev.parent || !vdev)
991 return; 991 return;