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, 10 insertions, 7 deletions

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 076ed5bf48b1..0eb3b1694287 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1636,21 +1636,24 @@ static int tvaudio_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
 
         switch (qc->id) {
         case V4L2_CID_AUDIO_MUTE:
-                break;
+                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
         case V4L2_CID_AUDIO_VOLUME:
+                if (desc->flags & CHIP_HAS_VOLUME)
+                        return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 58880);
+                break;
         case V4L2_CID_AUDIO_BALANCE:
-                if (!(desc->flags & CHIP_HAS_VOLUME))
-                        return -EINVAL;
+                if (desc->flags & CHIP_HAS_VOLUME)
+                        return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
                 break;
         case V4L2_CID_AUDIO_BASS:
         case V4L2_CID_AUDIO_TREBLE:
-                if (!(desc->flags & CHIP_HAS_BASSTREBLE))
-                        return -EINVAL;
+                if (desc->flags & CHIP_HAS_BASSTREBLE)
+                        return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
                 break;
         default:
-                return -EINVAL;
+                break;
         }
-        return v4l2_ctrl_query_fill_std(qc);
+        return -EINVAL;
 }
 
 static int tvaudio_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *rt)