8 files changed, 29 insertions, 31 deletions

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 46cacf845049..6d1e4e750f63 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -2109,7 +2109,7 @@ static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
                                  V4L2_CID_TUNE_ANTENNA_CAPACITOR,
                                  0, 255, 1, 255);
         if (ctrl)
-                ctrl->is_volatile = 1;
+                ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
         if (radio->ctrl_handler.error) {
                 r = radio->ctrl_handler.error;
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index 478d1e93ada6..aaee74752a85 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -559,7 +559,7 @@ int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)
                         255, 1, 255);
 
         if (ctrl)
-                ctrl->is_volatile = 1;
+                ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
         return 0;
 }
diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c
index 279d75d38188..d0e8ac1f9cde 100644
--- a/drivers/media/video/adp1653.c
+++ b/drivers/media/video/adp1653.c
@@ -258,7 +258,7 @@ static int adp1653_init_controls(struct adp1653_flash *flash)
         if (flash->ctrls.error)
                 return flash->ctrls.error;
 
-        fault->is_volatile = 1;
+        fault->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
         flash->subdev.ctrl_handler = &flash->ctrls;
         return 0;
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 8c70e64444e7..6873bf50869f 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -640,7 +640,7 @@ static int pwc_set_awb(struct pwc_device *pdev)
                         return ret;
 
                 /* Update val when coming from auto or going to a preset */
-                if (pdev->red_balance->is_volatile ||
+                if ((pdev->red_balance->flags & V4L2_CTRL_FLAG_VOLATILE) ||
                     pdev->auto_white_balance->val == awb_indoor ||
                     pdev->auto_white_balance->val == awb_outdoor ||
                     pdev->auto_white_balance->val == awb_fl) {
@@ -654,12 +654,12 @@ static int pwc_set_awb(struct pwc_device *pdev)
                                         &pdev->blue_balance->val);
                 }
                 if (pdev->auto_white_balance->val == awb_auto) {
-                        pdev->red_balance->is_volatile = true;
-                        pdev->blue_balance->is_volatile = true;
+                        pdev->red_balance->flags |= V4L2_CTRL_FLAG_VOLATILE;
+                        pdev->blue_balance->flags |= V4L2_CTRL_FLAG_VOLATILE;
                         pdev->color_bal_valid = false; /* Force cache update */
                 } else {
-                        pdev->red_balance->is_volatile = false;
-                        pdev->blue_balance->is_volatile = false;
+                        pdev->red_balance->flags &= ~V4L2_CTRL_FLAG_VOLATILE;
+                        pdev->blue_balance->flags &= ~V4L2_CTRL_FLAG_VOLATILE;
                 }
         }
 
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
index 32f898979809..bfbe08432050 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
@@ -165,7 +165,7 @@ static struct mfc_control controls[] = {
                 .maximum = 32,
                 .step = 1,
                 .default_value = 1,
-                .is_volatile = 1,
+                .flags = V4L2_CTRL_FLAG_VOLATILE,
         },
 };
 
@@ -1020,7 +1020,7 @@ int s5p_mfc_dec_ctrls_setup(struct s5p_mfc_ctx *ctx)
                         return ctx->ctrl_handler.error;
                 }
                 if (controls[i].is_volatile && ctx->ctrls[i])
-                        ctx->ctrls[i]->is_volatile = 1;
+                        ctx->ctrls[i]->flags |= V4L2_CTRL_FLAG_VOLATILE;
         }
         return 0;
 }
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index 14ddbd26ebf4..4c90e53bd964 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -1814,7 +1814,7 @@ int s5p_mfc_enc_ctrls_setup(struct s5p_mfc_ctx *ctx)
                         return ctx->ctrl_handler.error;
                 }
                 if (controls[i].is_volatile && ctx->ctrls[i])
-                        ctx->ctrls[i]->is_volatile = 1;
+                        ctx->ctrls[i]->flags |= V4L2_CTRL_FLAG_VOLATILE;
         }
         return 0;
 }
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index f2ae405c74ac..e443d0d54f8f 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1601,7 +1601,7 @@ static int saa711x_probe(struct i2c_client *client,
                         V4L2_CID_CHROMA_AGC, 0, 1, 1, 1);
         state->gain = v4l2_ctrl_new_std(hdl, &saa711x_ctrl_ops,
                         V4L2_CID_CHROMA_GAIN, 0, 127, 1, 40);
-        state->gain->is_volatile = 1;
+        state->gain->flags |= V4L2_CTRL_FLAG_VOLATILE;
         sd->ctrl_handler = hdl;
         if (hdl->error) {
                 int err = hdl->error;
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index 06b6014d4fb4..166762182f8e 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -43,7 +43,7 @@ struct v4l2_ctrl_helper {
 };
 
 /* Small helper function to determine if the autocluster is set to manual
-   mode. In that case the is_volatile flag should be ignored. */
+   mode. */
 static bool is_cur_manual(const struct v4l2_ctrl *master)
 {
         return master->is_auto && master->cur.val == master->manual_mode_value;
@@ -1394,10 +1394,8 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl,
                         type, min, max,
                         is_menu ? cfg->menu_skip_mask : step,
                         def, flags, qmenu, priv);
-        if (ctrl) {
+        if (ctrl)
                 ctrl->is_private = cfg->is_private;
-                ctrl->is_volatile = cfg->is_volatile;
-        }
         return ctrl;
 }
 EXPORT_SYMBOL(v4l2_ctrl_new_custom);
@@ -1519,12 +1517,12 @@ void v4l2_ctrl_auto_cluster(unsigned ncontrols, struct v4l2_ctrl **controls,
         master->manual_mode_value = manual_val;
         master->flags |= V4L2_CTRL_FLAG_UPDATE;
         flag = is_cur_manual(master) ? 0 : V4L2_CTRL_FLAG_INACTIVE;
+        if (set_volatile)
+                flag |= V4L2_CTRL_FLAG_VOLATILE;
 
         for (i = 1; i < ncontrols; i++)
-                if (controls[i]) {
-                        controls[i]->is_volatile = set_volatile;
+                if (controls[i])
                         controls[i]->flags |= flag;
-                }
 }
 EXPORT_SYMBOL(v4l2_ctrl_auto_cluster);
 
@@ -1579,9 +1577,6 @@ EXPORT_SYMBOL(v4l2_ctrl_grab);
 static void log_ctrl(const struct v4l2_ctrl *ctrl,
                      const char *prefix, const char *colon)
 {
-        int fl_inact = ctrl->flags & V4L2_CTRL_FLAG_INACTIVE;
-        int fl_grabbed = ctrl->flags & V4L2_CTRL_FLAG_GRABBED;
-
         if (ctrl->flags & (V4L2_CTRL_FLAG_DISABLED | V4L2_CTRL_FLAG_WRITE_ONLY))
                 return;
         if (ctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)
@@ -1612,14 +1607,17 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
                 printk(KERN_CONT "unknown type %d", ctrl->type);
                 break;
         }
-        if (fl_inact && fl_grabbed)
-                printk(KERN_CONT " (inactive, grabbed)\n");
-        else if (fl_inact)
-                printk(KERN_CONT " (inactive)\n");
-        else if (fl_grabbed)
-                printk(KERN_CONT " (grabbed)\n");
-        else
-                printk(KERN_CONT "\n");
+        if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE |
+                           V4L2_CTRL_FLAG_GRABBED |
+                           V4L2_CTRL_FLAG_VOLATILE)) {
+                if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)
+                        printk(KERN_CONT " inactive");
+                if (ctrl->flags & V4L2_CTRL_FLAG_GRABBED)
+                        printk(KERN_CONT " grabbed");
+                if (ctrl->flags & V4L2_CTRL_FLAG_VOLATILE)
+                        printk(KERN_CONT " volatile");
+        }
+        printk(KERN_CONT "\n");
 }
 
 /* Log all controls owned by the handler */
@@ -2004,7 +2002,7 @@ static int get_ctrl(struct v4l2_ctrl *ctrl, s32 *val)
 
         v4l2_ctrl_lock(master);
         /* g_volatile_ctrl will update the current control values */
-        if (ctrl->is_volatile && !is_cur_manual(master)) {
+        if ((ctrl->flags & V4L2_CTRL_FLAG_VOLATILE) && !is_cur_manual(master)) {
                 for (i = 0; i < master->ncontrols; i++)
                         cur_to_new(master->cluster[i]);
                 ret = call_op(master, g_volatile_ctrl);