V4L/DVB (12273): em28xx-video: rename ac97 audio controls to better document it
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 19 Jul 2009 12:10:06 +0000 (09:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 12 Sep 2009 15:17:41 +0000 (12:17 -0300)
As em28xx chip has nothing to do with volume/mute controls, rename those
controls to properly indicate that they control the companion AC97 chip
that it is inside the boards with this chip.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/em28xx/em28xx-video.c

index ab079d9256c463a0c9889841ed3e0946969f1929..e612e43b0ef1c9ac01d3dec4e63f4468f3c6ad6b 100644 (file)
@@ -124,7 +124,7 @@ static struct em28xx_fmt format[] = {
 
 /* supported controls */
 /* Common to all boards */
-static struct v4l2_queryctrl em28xx_qctrl[] = {
+static struct v4l2_queryctrl ac97_qctrl[] = {
        {
                .id = V4L2_CID_AUDIO_VOLUME,
                .type = V4L2_CTRL_TYPE_INTEGER,
@@ -1050,9 +1050,9 @@ static int vidioc_queryctrl(struct file *file, void *priv,
        qc->id = id;
 
        if (!dev->board.has_msp34xx) {
-               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-                       if (qc->id && qc->id == em28xx_qctrl[i].id) {
-                               memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
+               for (i = 0; i < ARRAY_SIZE(ac97_qctrl); i++) {
+                       if (qc->id && qc->id == ac97_qctrl[i].id) {
+                               memcpy(qc, &(ac97_qctrl[i]), sizeof(*qc));
                                return 0;
                        }
                }
@@ -1114,10 +1114,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_ctrl, ctrl);
        else {
                rc = 1;
-               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-                       if (ctrl->id == em28xx_qctrl[i].id) {
-                               if (ctrl->value < em28xx_qctrl[i].minimum ||
-                                   ctrl->value > em28xx_qctrl[i].maximum) {
+               for (i = 0; i < ARRAY_SIZE(ac97_qctrl); i++) {
+                       if (ctrl->id == ac97_qctrl[i].id) {
+                               if (ctrl->value < ac97_qctrl[i].minimum ||
+                                   ctrl->value > ac97_qctrl[i].maximum) {
                                        rc = -ERANGE;
                                        break;
                                }
@@ -1654,9 +1654,9 @@ static int radio_queryctrl(struct file *file, void *priv,
                qc->id >= V4L2_CID_LASTP1)
                return -EINVAL;
 
-       for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-               if (qc->id && qc->id == em28xx_qctrl[i].id) {
-                       memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
+       for (i = 0; i < ARRAY_SIZE(ac97_qctrl); i++) {
+               if (qc->id && qc->id == ac97_qctrl[i].id) {
+                       memcpy(qc, &(ac97_qctrl[i]), sizeof(*qc));
                        return 0;
                }
        }