[media] v4l2-ctrls: use ptrs for all but the s32 type

Rather than having two unions for all types just keep 'val' and
'cur.val' and use the p_cur and p_new unions to access all others.

The only reason for keeping 'val' and 'cur.val' is that it is used
all over, so converting this as well would be a huge job.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index a38bd55909b2..eb69c52e2f64 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -187,17 +187,9 @@ struct v4l2_ctrl {
         };
         unsigned long flags;
         void *priv;
-        union {
-                s32 val;
-                s64 val64;
-                char *string;
-                void *p;
-        };
-        union {
+        s32 val;
+        struct {
                 s32 val;
-                s64 val64;
-                char *string;
-                void *p;
         } cur;
 
         union v4l2_ctrl_ptr p_new;