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 | 94205c7a48b637ae60bd69ac4cc16743a6dddd09 (patch) | |
tree | dc2b96a3700697a6b3326853627fee92e76668ce /drivers | |
parent | 7e28adb2497f6b873516163e2d29210c11777613 (diff) |
V4L/DVB (7519): media/video/cpia2 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')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c index a439a56c3cc9..c8b9fdb700ff 100644 --- a/drivers/media/video/cpia2/cpia2_core.c +++ b/drivers/media/video/cpia2/cpia2_core.c | |||
@@ -570,7 +570,7 @@ int cpia2_send_command(struct camera_data *cam, struct cpia2_command *cmd) | |||
570 | block_name[block_index]); | 570 | block_name[block_index]); |
571 | break; | 571 | break; |
572 | default: | 572 | default: |
573 | LOG("%s: invalid request mode\n",__FUNCTION__); | 573 | LOG("%s: invalid request mode\n",__func__); |
574 | return -EINVAL; | 574 | return -EINVAL; |
575 | } | 575 | } |
576 | 576 | ||
@@ -952,7 +952,7 @@ static int set_default_user_mode(struct camera_data *cam) | |||
952 | frame_rate = CPIA2_VP_FRAMERATE_30; | 952 | frame_rate = CPIA2_VP_FRAMERATE_30; |
953 | break; | 953 | break; |
954 | default: | 954 | default: |
955 | LOG("%s: Invalid sensor flag value 0x%0X\n",__FUNCTION__, | 955 | LOG("%s: Invalid sensor flag value 0x%0X\n",__func__, |
956 | cam->params.version.sensor_flags); | 956 | cam->params.version.sensor_flags); |
957 | return -EINVAL; | 957 | return -EINVAL; |
958 | } | 958 | } |
@@ -2356,12 +2356,12 @@ long cpia2_read(struct camera_data *cam, | |||
2356 | } | 2356 | } |
2357 | 2357 | ||
2358 | if (!buf) { | 2358 | if (!buf) { |
2359 | ERR("%s: buffer NULL\n",__FUNCTION__); | 2359 | ERR("%s: buffer NULL\n",__func__); |
2360 | return -EINVAL; | 2360 | return -EINVAL; |
2361 | } | 2361 | } |
2362 | 2362 | ||
2363 | if (!cam) { | 2363 | if (!cam) { |
2364 | ERR("%s: Internal error, camera_data NULL!\n",__FUNCTION__); | 2364 | ERR("%s: Internal error, camera_data NULL!\n",__func__); |
2365 | return -EINVAL; | 2365 | return -EINVAL; |
2366 | } | 2366 | } |
2367 | 2367 | ||
@@ -2370,7 +2370,7 @@ long cpia2_read(struct camera_data *cam, | |||
2370 | return -ERESTARTSYS; | 2370 | return -ERESTARTSYS; |
2371 | 2371 | ||
2372 | if (!cam->present) { | 2372 | if (!cam->present) { |
2373 | LOG("%s: camera removed\n",__FUNCTION__); | 2373 | LOG("%s: camera removed\n",__func__); |
2374 | mutex_unlock(&cam->busy_lock); | 2374 | mutex_unlock(&cam->busy_lock); |
2375 | return 0; /* EOF */ | 2375 | return 0; /* EOF */ |
2376 | } | 2376 | } |
@@ -2434,7 +2434,7 @@ unsigned int cpia2_poll(struct camera_data *cam, struct file *filp, | |||
2434 | unsigned int status=0; | 2434 | unsigned int status=0; |
2435 | 2435 | ||
2436 | if(!cam) { | 2436 | if(!cam) { |
2437 | ERR("%s: Internal error, camera_data not found!\n",__FUNCTION__); | 2437 | ERR("%s: Internal error, camera_data not found!\n",__func__); |
2438 | return POLLERR; | 2438 | return POLLERR; |
2439 | } | 2439 | } |
2440 | 2440 | ||