[media] v4l2-ctrls: replace is_volatile with V4L2_CTRL_FLAG_VOLATILE
With the new flag there is no need anymore to have a separate is_volatile
field. Modify all users to use the new flag.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 8c70e64..6873bf5 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -640,7 +640,7 @@
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 @@
&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;
}
}