V4L/DVB (7520): media/video/cx23885 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>

1 files changed, 27 insertions, 27 deletions

diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 45bf2146a193..84652210a28c 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -141,7 +141,7 @@ static struct cx23885_fmt *format_by_fourcc(unsigned int fourcc)
                 if (formats[i].fourcc == fourcc)
                         return formats+i;
 
-        printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __FUNCTION__, fourcc);
+        printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __func__, fourcc);
         return NULL;
 }
 
@@ -292,13 +292,13 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
         }
         if (bc != 1)
                 printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",
-                        __FUNCTION__, bc);
+                        __func__, bc);
 }
 
 int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 {
         dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",
-                __FUNCTION__,
+                __func__,
                 (unsigned int)norm,
                 v4l2_norm_to_name(norm));
 
@@ -319,7 +319,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
                                     char *type)
 {
         struct video_device *vfd;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         vfd = video_device_alloc();
         if (NULL == vfd)
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(cx23885_ctrl_query);
 static int res_get(struct cx23885_dev *dev, struct cx23885_fh *fh,
         unsigned int bit)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         if (fh->resources & bit)
                 /* have it already allocated */
                 return 1;
@@ -392,7 +392,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
         unsigned int bits)
 {
         BUG_ON((fh->resources & bits) != bits);
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         mutex_lock(&dev->lock);
         fh->resources  &= ~bits;
@@ -407,7 +407,7 @@ int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
         memset(&route, 0, sizeof(route));
 
         dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
-                __FUNCTION__,
+                __func__,
                 input, INPUT(input)->vmux,
                 INPUT(input)->gpio0, INPUT(input)->gpio1,
                 INPUT(input)->gpio2, INPUT(input)->gpio3);
@@ -427,7 +427,7 @@ EXPORT_SYMBOL(cx23885_video_mux);
 int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
         unsigned int height, enum v4l2_field field)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         return 0;
 }
 
@@ -435,7 +435,7 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev,
                            struct cx23885_dmaqueue *q,
                            struct cx23885_buffer *buf)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         /* setup fifo + format */
         cx23885_sram_channel_setup(dev, &dev->sram_channels[SRAM_CH01],
@@ -463,7 +463,7 @@ static int cx23885_restart_video_queue(struct cx23885_dev *dev,
 {
         struct cx23885_buffer *buf, *prev;
         struct list_head *item;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         if (!list_empty(&q->active)) {
                 buf = list_entry(q->active.next, struct cx23885_buffer,
@@ -579,13 +579,13 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                         if (dev->tvnorm & V4L2_STD_NTSC) {
                                 /* cx25840 transmits NTSC bottom field first */
                                 dprintk(1, "%s() Creating NTSC risc\n",
-                                        __FUNCTION__);
+                                        __func__);
                                 line0_offset = buf->bpl;
                                 line1_offset = 0;
                         } else {
                                 /* All other formats are top field first */
                                 dprintk(1, "%s() Creating PAL/SECAM risc\n",
-                                        __FUNCTION__);
+                                        __func__);
                                 line0_offset = 0;
                                 line1_offset = buf->bpl;
                         }
@@ -885,7 +885,7 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)
 
 int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
-        dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __FUNCTION__);
+        dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);
         return 0;
 }
@@ -894,7 +894,7 @@ EXPORT_SYMBOL(cx23885_get_control);
 int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
         dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"
-                " (disabled - no action)\n", __FUNCTION__);
+                " (disabled - no action)\n", __func__);
         return 0;
 }
 EXPORT_SYMBOL(cx23885_set_control);
@@ -990,7 +990,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
         struct cx23885_dev *dev  = ((struct cx23885_fh *)priv)->dev;
         int err;
 
-        dprintk(2, "%s()\n", __FUNCTION__);
+        dprintk(2, "%s()\n", __func__);
         err = vidioc_try_fmt_cap(file, priv, f);
 
         if (0 != err)
@@ -999,7 +999,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
         fh->width      = f->fmt.pix.width;
         fh->height     = f->fmt.pix.height;
         fh->vidq.field = f->fmt.pix.field;
-        dprintk(2, "%s() width=%d height=%d field=%d\n", __FUNCTION__,
+        dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
                 fh->width, fh->height, fh->vidq.field);
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_FMT, f);
         return 0;
@@ -1101,7 +1101,7 @@ static int vidioc_streamon(struct file *file, void *priv,
 {
         struct cx23885_fh *fh = priv;
         struct cx23885_dev *dev = fh->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
                 return -EINVAL;
@@ -1118,7 +1118,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
         struct cx23885_fh *fh = priv;
         struct cx23885_dev *dev = fh->dev;
         int err, res;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
@@ -1136,7 +1136,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)
 {
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         mutex_lock(&dev->lock);
         cx23885_set_tvnorm(dev, *tvnorms);
@@ -1159,7 +1159,7 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
                 [CX23885_VMUX_DEBUG]      = "for debug only",
         };
         unsigned int n;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         n = i->index;
         if (n >= 4)
@@ -1184,7 +1184,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
                                 struct v4l2_input *i)
 {
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         return cx23885_enum_input(dev, i);
 }
 
@@ -1193,7 +1193,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
         *i = dev->input;
-        dprintk(1, "%s() returns %d\n", __FUNCTION__, *i);
+        dprintk(1, "%s() returns %d\n", __func__, *i);
         return 0;
 }
 
@@ -1201,10 +1201,10 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
 {
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
-        dprintk(1, "%s(%d)\n", __FUNCTION__, i);
+        dprintk(1, "%s(%d)\n", __func__, i);
 
         if (i >= 4) {
-                dprintk(1, "%s() -EINVAL\n", __FUNCTION__);
+                dprintk(1, "%s() -EINVAL\n", __func__);
                 return -EINVAL;
         }
 
@@ -1389,7 +1389,7 @@ int cx23885_video_irq(struct cx23885_dev *dev, u32 status)
                 return handled;
         cx_write(VID_A_INT_STAT, status);
 
-        dprintk(2, "%s() status = 0x%08x\n", __FUNCTION__, status);
+        dprintk(2, "%s() status = 0x%08x\n", __func__, status);
         /* risc op code error */
         if (status & (1 << 16)) {
                 printk(KERN_WARNING "%s/0: video risc op code error\n",
@@ -1487,7 +1487,7 @@ static const struct file_operations radio_fops = {
 
 void cx23885_video_unregister(struct cx23885_dev *dev)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         cx_clear(PCI_INT_MSK, 1);
 
         if (dev->video_dev) {
@@ -1505,7 +1505,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
 {
         int err;
 
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         spin_lock_init(&dev->slock);
 
         /* Initialize VBI template */