V4L/DVB (9215): si470x: improvement of unsupported base controls

This patch changes the handling of unsupported base controls.

In the former version, specific unsupported base controls were listed in
the queryctrl table and were flagged as disabled controls. This was done
for all base controls used by the applications.

The patch now removes the specific base controls and instead lets
queryctrl automatically return unsupported base controls flagged as
disabled.

Signed-off-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 12 insertions, 21 deletions

diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 2f680268c545..31da21a38f24 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1176,7 +1176,6 @@ static const struct file_operations si470x_fops = {
  * si470x_v4l2_queryctrl - query control
  */
 static struct v4l2_queryctrl si470x_v4l2_queryctrl[] = {
-/* HINT: the disabled controls are only here to satify kradio and such apps */
         {
                 .id             = V4L2_CID_AUDIO_VOLUME,
                 .type           = V4L2_CTRL_TYPE_INTEGER,
@@ -1187,18 +1186,6 @@ static struct v4l2_queryctrl si470x_v4l2_queryctrl[] = {
                 .default_value  = 15,
         },
         {
-                .id             = V4L2_CID_AUDIO_BALANCE,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_BASS,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
-                .id             = V4L2_CID_AUDIO_TREBLE,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
-        {
                 .id             = V4L2_CID_AUDIO_MUTE,
                 .type           = V4L2_CTRL_TYPE_BOOLEAN,
                 .name           = "Mute",
@@ -1207,10 +1194,6 @@ static struct v4l2_queryctrl si470x_v4l2_queryctrl[] = {
                 .step           = 1,
                 .default_value  = 1,
         },
-        {
-                .id             = V4L2_CID_AUDIO_LOUDNESS,
-                .flags          = V4L2_CTRL_FLAG_DISABLED,
-        },
 };
 
 
@@ -1267,21 +1250,29 @@ static int si470x_vidioc_s_input(struct file *file, void *priv, unsigned int i)
 static int si470x_vidioc_queryctrl(struct file *file, void *priv,
                 struct v4l2_queryctrl *qc)
 {
-        unsigned char i;
+        unsigned char i = 0;
         int retval = -EINVAL;
 
-        /* safety checks */
-        if (!qc->id)
+        /* abort if qc->id is below V4L2_CID_BASE */
+        if (qc->id < V4L2_CID_BASE)
                 goto done;
 
+        /* search video control */
         for (i = 0; i < ARRAY_SIZE(si470x_v4l2_queryctrl); i++) {
                 if (qc->id == si470x_v4l2_queryctrl[i].id) {
                         memcpy(qc, &(si470x_v4l2_queryctrl[i]), sizeof(*qc));
-                        retval = 0;
+                        retval = 0; /* found */
                         break;
                 }
         }
 
+        /* disable unsupported base controls */
+        /* to satisfy kradio and such apps */
+        if ((retval == -EINVAL) && (qc->id < V4L2_CID_LASTP1)) {
+                qc->flags = V4L2_CTRL_FLAG_DISABLED;
+                retval = 0;
+        }
+
 done:
         if (retval < 0)
                 printk(KERN_WARNING DRIVER_NAME