V4L/DVB: s2255drv: cleanup of V4L2 controls

Signed-off-by: Dean Anderson <dean@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 882a79679dc6a9f7beadb98a2eb507428bad205c..631a84eea1ae32f17985fec592ded6257a79c56d 100644 (file)
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -310,7 +310,7 @@ struct s2255_fh {
 /* Need DSP version 5+ for video status feature */
 #define S2255_MIN_DSP_STATUS    5
 #define S2255_MAJOR_VERSION    1
-#define S2255_MINOR_VERSION    16
+#define S2255_MINOR_VERSION    17
 #define S2255_RELEASE          0
 #define S2255_VERSION          KERNEL_VERSION(S2255_MAJOR_VERSION, \
                                               S2255_MINOR_VERSION, \
@@ -384,49 +384,6 @@ MODULE_DEVICE_TABLE(usb, s2255_table);
 
 #define BUFFER_TIMEOUT msecs_to_jiffies(400)
 
-/* supported controls */
-static struct v4l2_queryctrl s2255_qctrl[] = {
-       {
-       .id = V4L2_CID_BRIGHTNESS,
-       .type = V4L2_CTRL_TYPE_INTEGER,
-       .name = "Brightness",
-       .minimum = -127,
-       .maximum = 128,
-       .step = 1,
-       .default_value = 0,
-       .flags = 0,
-       }, {
-       .id = V4L2_CID_CONTRAST,
-       .type = V4L2_CTRL_TYPE_INTEGER,
-       .name = "Contrast",
-       .minimum = 0,
-       .maximum = 255,
-       .step = 0x1,
-       .default_value = DEF_CONTRAST,
-       .flags = 0,
-       }, {
-       .id = V4L2_CID_SATURATION,
-       .type = V4L2_CTRL_TYPE_INTEGER,
-       .name = "Saturation",
-       .minimum = 0,
-       .maximum = 255,
-       .step = 0x1,
-       .default_value = DEF_SATURATION,
-       .flags = 0,
-       }, {
-       .id = V4L2_CID_HUE,
-       .type = V4L2_CTRL_TYPE_INTEGER,
-       .name = "Hue",
-       .minimum = 0,
-       .maximum = 255,
-       .step = 0x1,
-       .default_value = DEF_HUE,
-       .flags = 0,
-       }
-};
-
-static int qctl_regs[ARRAY_SIZE(s2255_qctrl)];
-
 /* image formats.  */
 static const struct s2255_fmt formats[] = {
        {
@@ -1472,74 +1429,82 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
 static int vidioc_queryctrl(struct file *file, void *priv,
                            struct v4l2_queryctrl *qc)
 {
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
-               if (qc->id && qc->id == s2255_qctrl[i].id) {
-                       memcpy(qc, &(s2255_qctrl[i]), sizeof(*qc));
-                       return 0;
-               }
-
-       dprintk(4, "query_ctrl -EINVAL %d\n", qc->id);
-       return -EINVAL;
+       switch (qc->id) {
+       case V4L2_CID_BRIGHTNESS:
+               v4l2_ctrl_query_fill(qc, -127, 127, 1, DEF_BRIGHT);
+               break;
+       case V4L2_CID_CONTRAST:
+               v4l2_ctrl_query_fill(qc, 0, 255, 1, DEF_CONTRAST);
+               break;
+       case V4L2_CID_SATURATION:
+               v4l2_ctrl_query_fill(qc, 0, 255, 1, DEF_SATURATION);
+               break;
+       case V4L2_CID_HUE:
+               v4l2_ctrl_query_fill(qc, 0, 255, 1, DEF_HUE);
+               break;
+       default:
+               return -EINVAL;
+       }
+       dprintk(4, "%s, id %d\n", __func__, qc->id);
+       return 0;
 }
 
 static int vidioc_g_ctrl(struct file *file, void *priv,
                         struct v4l2_control *ctrl)
 {
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
-               if (ctrl->id == s2255_qctrl[i].id) {
-                       ctrl->value = qctl_regs[i];
-                       return 0;
-               }
-       dprintk(4, "g_ctrl -EINVAL\n");
-
-       return -EINVAL;
+       struct s2255_fh *fh = priv;
+       switch (ctrl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               ctrl->value = fh->mode.bright;
+               break;
+       case V4L2_CID_CONTRAST:
+               ctrl->value = fh->mode.contrast;
+               break;
+       case V4L2_CID_SATURATION:
+               ctrl->value = fh->mode.saturation;
+               break;
+       case V4L2_CID_HUE:
+               ctrl->value = fh->mode.hue;
+               break;
+       default:
+               return -EINVAL;
+       }
+       dprintk(4, "%s, id %d val %d\n", __func__, ctrl->id, ctrl->value);
+       return 0;
 }
 
 static int vidioc_s_ctrl(struct file *file, void *priv,
                         struct v4l2_control *ctrl)
 {
-       int i;
        struct s2255_fh *fh = priv;
        struct s2255_dev *dev = fh->dev;
        struct s2255_mode *mode;
        mode = &fh->mode;
-       dprintk(4, "vidioc_s_ctrl\n");
-       for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++) {
-               if (ctrl->id == s2255_qctrl[i].id) {
-                       if (ctrl->value < s2255_qctrl[i].minimum ||
-                           ctrl->value > s2255_qctrl[i].maximum)
-                               return -ERANGE;
-
-                       qctl_regs[i] = ctrl->value;
-                       /* update the mode to the corresponding value */
-                       switch (ctrl->id) {
-                       case V4L2_CID_BRIGHTNESS:
-                               mode->bright = ctrl->value;
-                               break;
-                       case V4L2_CID_CONTRAST:
-                               mode->contrast = ctrl->value;
-                               break;
-                       case V4L2_CID_HUE:
-                               mode->hue = ctrl->value;
-                               break;
-                       case V4L2_CID_SATURATION:
-                               mode->saturation = ctrl->value;
-                               break;
-                       }
-                       mode->restart = 0;
-                       /* set mode here.  Note: stream does not need restarted.
-                          some V4L programs restart stream unnecessarily
-                          after a s_crtl.
-                        */
-                       s2255_set_mode(dev, fh->channel, mode);
-                       return 0;
-               }
+       dprintk(4, "%s\n", __func__);
+       /* update the mode to the corresponding value */
+       switch (ctrl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               mode->bright = ctrl->value;
+               break;
+       case V4L2_CID_CONTRAST:
+               mode->contrast = ctrl->value;
+               break;
+       case V4L2_CID_HUE:
+               mode->hue = ctrl->value;
+               break;
+       case V4L2_CID_SATURATION:
+               mode->saturation = ctrl->value;
+               break;
+       default:
+               return -EINVAL;
        }
-       return -EINVAL;
+       mode->restart = 0;
+       /* set mode here.  Note: stream does not need restarted.
+          some V4L programs restart stream unnecessarily
+          after a s_crtl.
+       */
+       s2255_set_mode(dev, fh->channel, mode);
+       return 0;
 }
 
 static int vidioc_g_jpegcomp(struct file *file, void *priv,
@@ -1701,18 +1666,11 @@ static int s2255_open(struct file *file)
        fh->width = LINE_SZ_4CIFS_NTSC;
        fh->height = NUM_LINES_4CIFS_NTSC * 2;
        fh->channel = cur_channel;
-
        /* configure channel to default state */
        if (!dev->chn_configured[cur_channel]) {
                s2255_set_mode(dev, cur_channel, &fh->mode);
                dev->chn_configured[cur_channel] = 1;
        }
-
-
-       /* Put all controls at a sane state */
-       for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
-               qctl_regs[i] = s2255_qctrl[i].default_value;
-
        dprintk(1, "s2255drv: open dev=%s type=%s users=%d\n",
                video_device_node_name(vdev), v4l2_type_names[type],
                dev->users[cur_channel]);