aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tvp5150.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-30 05:55:27 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:49 -0400
commitbccfa449ae5bd4cc5b52160d25fbdb1fe8a27932 (patch)
tree09ca059a87351bb1e68843557173bb2f13da8505 /drivers/media/video/tvp5150.c
parent41c129a87014bb83efb3e0224bb44cfc54659f8f (diff)
V4L/DVB (11311): v4l: replace 'ioctl' references in v4l i2c drivers
Replace 'VIDIOC_' references in v4l i2c drivers by their new v4l2_subdev callback names. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tvp5150.c')
-rw-r--r--drivers/media/video/tvp5150.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 9ee55f26c4f9..3a5a95f134b4 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -631,7 +631,7 @@ static int tvp5150_g_sliced_vbi_cap(struct v4l2_subdev *sd,
631 const struct i2c_vbi_ram_value *regs = vbi_ram_default; 631 const struct i2c_vbi_ram_value *regs = vbi_ram_default;
632 int line; 632 int line;
633 633
634 v4l2_dbg(1, debug, sd, "VIDIOC_G_SLICED_VBI_CAP\n"); 634 v4l2_dbg(1, debug, sd, "g_sliced_vbi_cap\n");
635 memset(cap, 0, sizeof *cap); 635 memset(cap, 0, sizeof *cap);
636 636
637 while (regs->reg != (u16)-1 ) { 637 while (regs->reg != (u16)-1 ) {
@@ -830,7 +830,7 @@ static int tvp5150_reset(struct v4l2_subdev *sd, u32 val)
830 830
831static int tvp5150_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 831static int tvp5150_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
832{ 832{
833 v4l2_dbg(1, debug, sd, "VIDIOC_G_CTRL called\n"); 833 v4l2_dbg(1, debug, sd, "g_ctrl called\n");
834 834
835 switch (ctrl->id) { 835 switch (ctrl->id) {
836 case V4L2_CID_BRIGHTNESS: 836 case V4L2_CID_BRIGHTNESS:
@@ -860,7 +860,7 @@ static int tvp5150_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
860 if (ctrl->value < tvp5150_qctrl[i].minimum || 860 if (ctrl->value < tvp5150_qctrl[i].minimum ||
861 ctrl->value > tvp5150_qctrl[i].maximum) 861 ctrl->value > tvp5150_qctrl[i].maximum)
862 return -ERANGE; 862 return -ERANGE;
863 v4l2_dbg(1, debug, sd, "VIDIOC_S_CTRL: id=%d, value=%d\n", 863 v4l2_dbg(1, debug, sd, "s_ctrl: id=%d, value=%d\n",
864 ctrl->id, ctrl->value); 864 ctrl->id, ctrl->value);
865 break; 865 break;
866 } 866 }
@@ -1014,7 +1014,7 @@ static int tvp5150_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
1014{ 1014{
1015 int i; 1015 int i;
1016 1016
1017 v4l2_dbg(1, debug, sd, "VIDIOC_QUERYCTRL called\n"); 1017 v4l2_dbg(1, debug, sd, "queryctrl called\n");
1018 1018
1019 for (i = 0; i < ARRAY_SIZE(tvp5150_qctrl); i++) 1019 for (i = 0; i < ARRAY_SIZE(tvp5150_qctrl); i++)
1020 if (qc->id && qc->id == tvp5150_qctrl[i].id) { 1020 if (qc->id && qc->id == tvp5150_qctrl[i].id) {