diff options
-rw-r--r-- | drivers/media/video/soc_camera.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index d015bfe00950..8ae2d9916d9f 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -44,7 +44,7 @@ format_by_fourcc(struct soc_camera_device *icd, unsigned int fourcc) | |||
44 | return NULL; | 44 | return NULL; |
45 | } | 45 | } |
46 | 46 | ||
47 | static int soc_camera_try_fmt_cap(struct file *file, void *priv, | 47 | static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, |
48 | struct v4l2_format *f) | 48 | struct v4l2_format *f) |
49 | { | 49 | { |
50 | struct soc_camera_file *icf = file->private_data; | 50 | struct soc_camera_file *icf = file->private_data; |
@@ -342,7 +342,7 @@ static struct file_operations soc_camera_fops = { | |||
342 | }; | 342 | }; |
343 | 343 | ||
344 | 344 | ||
345 | static int soc_camera_s_fmt_cap(struct file *file, void *priv, | 345 | static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv, |
346 | struct v4l2_format *f) | 346 | struct v4l2_format *f) |
347 | { | 347 | { |
348 | struct soc_camera_file *icf = file->private_data; | 348 | struct soc_camera_file *icf = file->private_data; |
@@ -362,7 +362,7 @@ static int soc_camera_s_fmt_cap(struct file *file, void *priv, | |||
362 | /* buswidth may be further adjusted by the ici */ | 362 | /* buswidth may be further adjusted by the ici */ |
363 | icd->buswidth = data_fmt->depth; | 363 | icd->buswidth = data_fmt->depth; |
364 | 364 | ||
365 | ret = soc_camera_try_fmt_cap(file, icf, f); | 365 | ret = soc_camera_try_fmt_vid_cap(file, icf, f); |
366 | if (ret < 0) | 366 | if (ret < 0) |
367 | return ret; | 367 | return ret; |
368 | 368 | ||
@@ -389,7 +389,7 @@ static int soc_camera_s_fmt_cap(struct file *file, void *priv, | |||
389 | return ici->ops->set_bus_param(icd, f->fmt.pix.pixelformat); | 389 | return ici->ops->set_bus_param(icd, f->fmt.pix.pixelformat); |
390 | } | 390 | } |
391 | 391 | ||
392 | static int soc_camera_enum_fmt_cap(struct file *file, void *priv, | 392 | static int soc_camera_enum_fmt_vid_cap(struct file *file, void *priv, |
393 | struct v4l2_fmtdesc *f) | 393 | struct v4l2_fmtdesc *f) |
394 | { | 394 | { |
395 | struct soc_camera_file *icf = file->private_data; | 395 | struct soc_camera_file *icf = file->private_data; |
@@ -408,7 +408,7 @@ static int soc_camera_enum_fmt_cap(struct file *file, void *priv, | |||
408 | return 0; | 408 | return 0; |
409 | } | 409 | } |
410 | 410 | ||
411 | static int soc_camera_g_fmt_cap(struct file *file, void *priv, | 411 | static int soc_camera_g_fmt_vid_cap(struct file *file, void *priv, |
412 | struct v4l2_format *f) | 412 | struct v4l2_format *f) |
413 | { | 413 | { |
414 | struct soc_camera_file *icf = file->private_data; | 414 | struct soc_camera_file *icf = file->private_data; |
@@ -925,15 +925,15 @@ int soc_camera_video_start(struct soc_camera_device *icd) | |||
925 | vdev->minor = -1; | 925 | vdev->minor = -1; |
926 | vdev->tvnorms = V4L2_STD_UNKNOWN, | 926 | vdev->tvnorms = V4L2_STD_UNKNOWN, |
927 | vdev->vidioc_querycap = soc_camera_querycap; | 927 | vdev->vidioc_querycap = soc_camera_querycap; |
928 | vdev->vidioc_g_fmt_cap = soc_camera_g_fmt_cap; | 928 | vdev->vidioc_g_fmt_vid_cap = soc_camera_g_fmt_vid_cap; |
929 | vdev->vidioc_enum_fmt_cap = soc_camera_enum_fmt_cap; | 929 | vdev->vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap; |
930 | vdev->vidioc_s_fmt_cap = soc_camera_s_fmt_cap; | 930 | vdev->vidioc_s_fmt_vid_cap = soc_camera_s_fmt_vid_cap; |
931 | vdev->vidioc_enum_input = soc_camera_enum_input; | 931 | vdev->vidioc_enum_input = soc_camera_enum_input; |
932 | vdev->vidioc_g_input = soc_camera_g_input; | 932 | vdev->vidioc_g_input = soc_camera_g_input; |
933 | vdev->vidioc_s_input = soc_camera_s_input; | 933 | vdev->vidioc_s_input = soc_camera_s_input; |
934 | vdev->vidioc_s_std = soc_camera_s_std; | 934 | vdev->vidioc_s_std = soc_camera_s_std; |
935 | vdev->vidioc_reqbufs = soc_camera_reqbufs; | 935 | vdev->vidioc_reqbufs = soc_camera_reqbufs; |
936 | vdev->vidioc_try_fmt_cap = soc_camera_try_fmt_cap; | 936 | vdev->vidioc_try_fmt_vid_cap = soc_camera_try_fmt_vid_cap; |
937 | vdev->vidioc_querybuf = soc_camera_querybuf; | 937 | vdev->vidioc_querybuf = soc_camera_querybuf; |
938 | vdev->vidioc_qbuf = soc_camera_qbuf; | 938 | vdev->vidioc_qbuf = soc_camera_qbuf; |
939 | vdev->vidioc_dqbuf = soc_camera_dqbuf; | 939 | vdev->vidioc_dqbuf = soc_camera_dqbuf; |