V4L/DVB (10698): v4l2-common: remove v4l2_ctrl_query_fill_std

The v4l2_ctrl_query_fill_std() function wasn't one the best idea I ever had.
It doesn't add anything valuable that cannot be expressed equally well with
v4l2_ctrl_query_fill and only adds overhead.

Replace it with v4l2_ctrl_query_fill() everywhere it is used and remove it
from v4l2_common.c.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index d4059ecaa58e..4a5d5ef9dfc7 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1205,10 +1205,12 @@ static int cx25840_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
 
         switch (qc->id) {
         case V4L2_CID_BRIGHTNESS:
+                return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
         case V4L2_CID_CONTRAST:
         case V4L2_CID_SATURATION:
+                return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
         case V4L2_CID_HUE:
-                return v4l2_ctrl_query_fill_std(qc);
+                return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
         default:
                 break;
         }
@@ -1220,10 +1222,11 @@ static int cx25840_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
                 return v4l2_ctrl_query_fill(qc, 0, 65535,
                                 65535 / 100, state->default_volume);
         case V4L2_CID_AUDIO_MUTE:
+                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
         case V4L2_CID_AUDIO_BALANCE:
         case V4L2_CID_AUDIO_BASS:
         case V4L2_CID_AUDIO_TREBLE:
-                return v4l2_ctrl_query_fill_std(qc);
+                return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
         default:
                 return -EINVAL;
         }