summaryrefslogtreecommitdiff
path: root/include/media/v4l2-ctrls.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-04-27 03:38:13 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-17 11:57:17 -0300
commit2a9ec3731137f973c6289698de6566a25418b96f (patch)
treeeb223ef2c2860dc1dd7bdd6fa06a7fca2210b133 /include/media/v4l2-ctrls.h
parent9ea1b7a4b66fddfab9e65e243b72d18371f8d9a5 (diff)
[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>
Diffstat (limited to 'include/media/v4l2-ctrls.h')
-rw-r--r--include/media/v4l2-ctrls.h12
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;