summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-07-19 11:14:46 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-07-30 14:52:00 -0400
commitcfca7644d7959e1f50cb132306d1557bf6c2da57 (patch)
tree460cb3ca813a309aa3d668d03ca715acf1128451 /include/media
parent3c2ade017a7e10470aa8112f8a4bfdb2ee30f97f (diff)
[media] V4L: Rename v4l2_async_bus_* to v4l2_async_match_*
enum v4l2_async_bus_type also selects a method subdevs are matched in the notification handlers, rename it to v4l2_async_match_type so V4L2_ASYNC_MATCH_OF entry can be further added for matching by device tree node pointer. Acked-and-tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-async.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index c3ec6ac75f7e..33e3b2a30ecb 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -22,10 +22,10 @@ struct v4l2_async_notifier;
22/* A random max subdevice number, used to allocate an array on stack */ 22/* A random max subdevice number, used to allocate an array on stack */
23#define V4L2_MAX_SUBDEVS 128U 23#define V4L2_MAX_SUBDEVS 128U
24 24
25enum v4l2_async_bus_type { 25enum v4l2_async_match_type {
26 V4L2_ASYNC_BUS_CUSTOM, 26 V4L2_ASYNC_MATCH_CUSTOM,
27 V4L2_ASYNC_BUS_PLATFORM, 27 V4L2_ASYNC_MATCH_DEVNAME,
28 V4L2_ASYNC_BUS_I2C, 28 V4L2_ASYNC_MATCH_I2C,
29}; 29};
30 30
31/** 31/**
@@ -36,11 +36,11 @@ enum v4l2_async_bus_type {
36 * probed, to a notifier->waiting list 36 * probed, to a notifier->waiting list
37 */ 37 */
38struct v4l2_async_subdev { 38struct v4l2_async_subdev {
39 enum v4l2_async_bus_type bus_type; 39 enum v4l2_async_match_type match_type;
40 union { 40 union {
41 struct { 41 struct {
42 const char *name; 42 const char *name;
43 } platform; 43 } device_name;
44 struct { 44 struct {
45 int adapter_id; 45 int adapter_id;
46 unsigned short address; 46 unsigned short address;