Skip to content

Commit

Permalink
V4L/DVB (7519): media/video/cpia2 replace remaining __FUNCTION__ occu…
Browse files Browse the repository at this point in the history
…rrences

__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>
  • Loading branch information
Harvey Harrison authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 7e28adb commit 94205c7
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/media/video/cpia2/cpia2_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand All @@ -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 */
}
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 94205c7

Please sign in to comment.