]> err.no Git - linux-2.6/commitdiff
V4L/DVB (7519): media/video/cpia2 replace remaining __FUNCTION__ occurrences
authorHarvey Harrison <harvey.harrison@gmail.com>
Wed, 9 Apr 2008 02:20:00 +0000 (23:20 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Thu, 24 Apr 2008 17:07:59 +0000 (14:07 -0300)
__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>
drivers/media/video/cpia2/cpia2_core.c

index a439a56c3cc96bba1697c591b1eabcee37caf38a..c8b9fdb700ff123138790e58452f4953dd3ef52b 100644 (file)
@@ -570,7 +570,7 @@ int cpia2_send_command(struct camera_data *cam, struct cpia2_command *cmd)
                            block_name[block_index]);
                break;
        default:
-               LOG("%s: invalid request mode\n",__FUNCTION__);
+               LOG("%s: invalid request mode\n",__func__);
                return -EINVAL;
        }
 
@@ -952,7 +952,7 @@ static int set_default_user_mode(struct camera_data *cam)
                        frame_rate = CPIA2_VP_FRAMERATE_30;
                break;
        default:
-               LOG("%s: Invalid sensor flag value 0x%0X\n",__FUNCTION__,
+               LOG("%s: Invalid sensor flag value 0x%0X\n",__func__,
                    cam->params.version.sensor_flags);
                return -EINVAL;
        }
@@ -2356,12 +2356,12 @@ long cpia2_read(struct camera_data *cam,
        }
 
        if (!buf) {
-               ERR("%s: buffer NULL\n",__FUNCTION__);
+               ERR("%s: buffer NULL\n",__func__);
                return -EINVAL;
        }
 
        if (!cam) {
-               ERR("%s: Internal error, camera_data NULL!\n",__FUNCTION__);
+               ERR("%s: Internal error, camera_data NULL!\n",__func__);
                return -EINVAL;
        }
 
@@ -2370,7 +2370,7 @@ long cpia2_read(struct camera_data *cam,
                return -ERESTARTSYS;
 
        if (!cam->present) {
-               LOG("%s: camera removed\n",__FUNCTION__);
+               LOG("%s: camera removed\n",__func__);
                mutex_unlock(&cam->busy_lock);
                return 0;       /* EOF */
        }
@@ -2434,7 +2434,7 @@ unsigned int cpia2_poll(struct camera_data *cam, struct file *filp,
        unsigned int status=0;
 
        if(!cam) {
-               ERR("%s: Internal error, camera_data not found!\n",__FUNCTION__);
+               ERR("%s: Internal error, camera_data not found!\n",__func__);
                return POLLERR;
        }