diff options
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 5195b1f3378a..d99453faaab7 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1593,7 +1593,7 @@ static struct v4l2_pix_format cafe_def_pix_format = { | |||
1593 | .sizeimage = VGA_WIDTH*VGA_HEIGHT*2, | 1593 | .sizeimage = VGA_WIDTH*VGA_HEIGHT*2, |
1594 | }; | 1594 | }; |
1595 | 1595 | ||
1596 | static int cafe_vidioc_enum_fmt_cap(struct file *filp, | 1596 | static int cafe_vidioc_enum_fmt_vid_cap(struct file *filp, |
1597 | void *priv, struct v4l2_fmtdesc *fmt) | 1597 | void *priv, struct v4l2_fmtdesc *fmt) |
1598 | { | 1598 | { |
1599 | struct cafe_camera *cam = priv; | 1599 | struct cafe_camera *cam = priv; |
@@ -1608,7 +1608,7 @@ static int cafe_vidioc_enum_fmt_cap(struct file *filp, | |||
1608 | } | 1608 | } |
1609 | 1609 | ||
1610 | 1610 | ||
1611 | static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, | 1611 | static int cafe_vidioc_try_fmt_vid_cap(struct file *filp, void *priv, |
1612 | struct v4l2_format *fmt) | 1612 | struct v4l2_format *fmt) |
1613 | { | 1613 | { |
1614 | struct cafe_camera *cam = priv; | 1614 | struct cafe_camera *cam = priv; |
@@ -1620,7 +1620,7 @@ static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, | |||
1620 | return ret; | 1620 | return ret; |
1621 | } | 1621 | } |
1622 | 1622 | ||
1623 | static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, | 1623 | static int cafe_vidioc_s_fmt_vid_cap(struct file *filp, void *priv, |
1624 | struct v4l2_format *fmt) | 1624 | struct v4l2_format *fmt) |
1625 | { | 1625 | { |
1626 | struct cafe_camera *cam = priv; | 1626 | struct cafe_camera *cam = priv; |
@@ -1635,7 +1635,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, | |||
1635 | /* | 1635 | /* |
1636 | * See if the formatting works in principle. | 1636 | * See if the formatting works in principle. |
1637 | */ | 1637 | */ |
1638 | ret = cafe_vidioc_try_fmt_cap(filp, priv, fmt); | 1638 | ret = cafe_vidioc_try_fmt_vid_cap(filp, priv, fmt); |
1639 | if (ret) | 1639 | if (ret) |
1640 | return ret; | 1640 | return ret; |
1641 | /* | 1641 | /* |
@@ -1670,7 +1670,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, | |||
1670 | * The V4l2 spec wants us to be smarter, and actually get this from | 1670 | * The V4l2 spec wants us to be smarter, and actually get this from |
1671 | * the camera (and not mess with it at open time). Someday. | 1671 | * the camera (and not mess with it at open time). Someday. |
1672 | */ | 1672 | */ |
1673 | static int cafe_vidioc_g_fmt_cap(struct file *filp, void *priv, | 1673 | static int cafe_vidioc_g_fmt_vid_cap(struct file *filp, void *priv, |
1674 | struct v4l2_format *f) | 1674 | struct v4l2_format *f) |
1675 | { | 1675 | { |
1676 | struct cafe_camera *cam = priv; | 1676 | struct cafe_camera *cam = priv; |
@@ -1780,10 +1780,10 @@ static struct video_device cafe_v4l_template = { | |||
1780 | .release = cafe_v4l_dev_release, | 1780 | .release = cafe_v4l_dev_release, |
1781 | 1781 | ||
1782 | .vidioc_querycap = cafe_vidioc_querycap, | 1782 | .vidioc_querycap = cafe_vidioc_querycap, |
1783 | .vidioc_enum_fmt_cap = cafe_vidioc_enum_fmt_cap, | 1783 | .vidioc_enum_fmt_vid_cap = cafe_vidioc_enum_fmt_vid_cap, |
1784 | .vidioc_try_fmt_cap = cafe_vidioc_try_fmt_cap, | 1784 | .vidioc_try_fmt_vid_cap = cafe_vidioc_try_fmt_vid_cap, |
1785 | .vidioc_s_fmt_cap = cafe_vidioc_s_fmt_cap, | 1785 | .vidioc_s_fmt_vid_cap = cafe_vidioc_s_fmt_vid_cap, |
1786 | .vidioc_g_fmt_cap = cafe_vidioc_g_fmt_cap, | 1786 | .vidioc_g_fmt_vid_cap = cafe_vidioc_g_fmt_vid_cap, |
1787 | .vidioc_enum_input = cafe_vidioc_enum_input, | 1787 | .vidioc_enum_input = cafe_vidioc_enum_input, |
1788 | .vidioc_g_input = cafe_vidioc_g_input, | 1788 | .vidioc_g_input = cafe_vidioc_g_input, |
1789 | .vidioc_s_input = cafe_vidioc_s_input, | 1789 | .vidioc_s_input = cafe_vidioc_s_input, |