diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-05-08 12:00:51 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-15 07:52:49 -0400 |
commit | ad3537b56742848743aa11d42ccc1d336682bd5b (patch) | |
tree | 55a0e35765ed6a8f8e5eb7720e9cd000329cb48f /drivers/media/video/soc_camera.c | |
parent | cbde6a2dbaf704defb95958af335fddd770edc4c (diff) |
[media] V4L: soc-camera: (cosmetic) use a more explicit name for a host handler
Use "enum_framesizes" instead of "enum_fsizes" to more precisely follow
the name of the respective ioctl().
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Sergio Aguirre <sergio.a.aguirre@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r-- | drivers/media/video/soc_camera.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index c3ab55883c2d..d86b15084628 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -257,13 +257,13 @@ static int soc_camera_g_std(struct file *file, void *priv, v4l2_std_id *a) | |||
257 | return v4l2_subdev_call(sd, core, g_std, a); | 257 | return v4l2_subdev_call(sd, core, g_std, a); |
258 | } | 258 | } |
259 | 259 | ||
260 | static int soc_camera_enum_fsizes(struct file *file, void *fh, | 260 | static int soc_camera_enum_framesizes(struct file *file, void *fh, |
261 | struct v4l2_frmsizeenum *fsize) | 261 | struct v4l2_frmsizeenum *fsize) |
262 | { | 262 | { |
263 | struct soc_camera_device *icd = file->private_data; | 263 | struct soc_camera_device *icd = file->private_data; |
264 | struct soc_camera_host *ici = to_soc_camera_host(icd->parent); | 264 | struct soc_camera_host *ici = to_soc_camera_host(icd->parent); |
265 | 265 | ||
266 | return ici->ops->enum_fsizes(icd, fsize); | 266 | return ici->ops->enum_framesizes(icd, fsize); |
267 | } | 267 | } |
268 | 268 | ||
269 | static int soc_camera_reqbufs(struct file *file, void *priv, | 269 | static int soc_camera_reqbufs(struct file *file, void *priv, |
@@ -1244,8 +1244,8 @@ static int default_s_parm(struct soc_camera_device *icd, | |||
1244 | return v4l2_subdev_call(sd, video, s_parm, parm); | 1244 | return v4l2_subdev_call(sd, video, s_parm, parm); |
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | static int default_enum_fsizes(struct soc_camera_device *icd, | 1247 | static int default_enum_framesizes(struct soc_camera_device *icd, |
1248 | struct v4l2_frmsizeenum *fsize) | 1248 | struct v4l2_frmsizeenum *fsize) |
1249 | { | 1249 | { |
1250 | int ret; | 1250 | int ret; |
1251 | struct v4l2_subdev *sd = soc_camera_to_subdev(icd); | 1251 | struct v4l2_subdev *sd = soc_camera_to_subdev(icd); |
@@ -1298,8 +1298,8 @@ int soc_camera_host_register(struct soc_camera_host *ici) | |||
1298 | ici->ops->set_parm = default_s_parm; | 1298 | ici->ops->set_parm = default_s_parm; |
1299 | if (!ici->ops->get_parm) | 1299 | if (!ici->ops->get_parm) |
1300 | ici->ops->get_parm = default_g_parm; | 1300 | ici->ops->get_parm = default_g_parm; |
1301 | if (!ici->ops->enum_fsizes) | 1301 | if (!ici->ops->enum_framesizes) |
1302 | ici->ops->enum_fsizes = default_enum_fsizes; | 1302 | ici->ops->enum_framesizes = default_enum_framesizes; |
1303 | 1303 | ||
1304 | mutex_lock(&list_lock); | 1304 | mutex_lock(&list_lock); |
1305 | list_for_each_entry(ix, &hosts, list) { | 1305 | list_for_each_entry(ix, &hosts, list) { |
@@ -1390,7 +1390,7 @@ static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = { | |||
1390 | .vidioc_s_input = soc_camera_s_input, | 1390 | .vidioc_s_input = soc_camera_s_input, |
1391 | .vidioc_s_std = soc_camera_s_std, | 1391 | .vidioc_s_std = soc_camera_s_std, |
1392 | .vidioc_g_std = soc_camera_g_std, | 1392 | .vidioc_g_std = soc_camera_g_std, |
1393 | .vidioc_enum_framesizes = soc_camera_enum_fsizes, | 1393 | .vidioc_enum_framesizes = soc_camera_enum_framesizes, |
1394 | .vidioc_reqbufs = soc_camera_reqbufs, | 1394 | .vidioc_reqbufs = soc_camera_reqbufs, |
1395 | .vidioc_querybuf = soc_camera_querybuf, | 1395 | .vidioc_querybuf = soc_camera_querybuf, |
1396 | .vidioc_qbuf = soc_camera_qbuf, | 1396 | .vidioc_qbuf = soc_camera_qbuf, |