diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-07-22 08:01:33 -0300 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-05-15 07:23:02 +0200 |
| commit | e9d60af442e810c5f63fd8697e8dc1e6d0e161fe (patch) | |
| tree | bb432e0534d8077f8039c5a629e8fa75ee5a0479 /include | |
| parent | 81448ff830a1c8b8bcfd53f1a9c7b9ab2ce2956f (diff) | |
| download | linux-3.10-e9d60af442e810c5f63fd8697e8dc1e6d0e161fe.tar.gz linux-3.10-e9d60af442e810c5f63fd8697e8dc1e6d0e161fe.tar.bz2 linux-3.10-e9d60af442e810c5f63fd8697e8dc1e6d0e161fe.zip | |
[media] V4L: Merge struct v4l2_async_subdev_list with struct v4l2_subdev
By integrating the v4l2-async API internals a bit more with
the core overall the v4l2-async code becomes a bit simpler
and easier to follow.
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')
| -rw-r--r-- | include/media/v4l2-async.h | 15 | ||||
| -rw-r--r-- | include/media/v4l2-subdev.h | 13 |
2 files changed, 7 insertions, 21 deletions
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h index 8fac8eaca51..768356917be 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -62,25 +62,12 @@ struct v4l2_async_subdev { }; /** - * v4l2_async_subdev_list - provided by subdevices - * @list: links struct v4l2_async_subdev_list objects to a global list - * before probing, and onto notifier->done after probing - * @asd: pointer to respective struct v4l2_async_subdev - * @notifier: pointer to managing notifier - */ -struct v4l2_async_subdev_list { - struct list_head list; - struct v4l2_async_subdev *asd; - struct v4l2_async_notifier *notifier; -}; - -/** * v4l2_async_notifier - v4l2_device notifier data * @num_subdevs:number of subdevices * @subdevs: array of pointers to subdevice descriptors * @v4l2_dev: pointer to struct v4l2_device * @waiting: list of struct v4l2_async_subdev, waiting for their drivers - * @done: list of struct v4l2_async_subdev_list, already probed + * @done: list of struct v4l2_subdev, already probed * @list: member in a global list of notifiers * @bound: a subdevice driver has successfully probed one of subdevices * @complete: all subdevices have been probed successfully diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index b27436e9b7b..7c18cd96c6e 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -588,15 +588,14 @@ struct v4l2_subdev { struct video_device *devnode; /* pointer to the physical device, if any */ struct device *dev; - struct v4l2_async_subdev_list asdl; + /* Links this subdev to a global subdev_list or @notifier->done list. */ + struct list_head async_list; + /* Pointer to respective struct v4l2_async_subdev. */ + struct v4l2_async_subdev *asd; + /* Pointer to the managing notifier. */ + struct v4l2_async_notifier *notifier; }; -static inline struct v4l2_subdev *v4l2_async_to_subdev( - struct v4l2_async_subdev_list *asdl) -{ - return container_of(asdl, struct v4l2_subdev, asdl); -} - #define media_entity_to_v4l2_subdev(ent) \ container_of(ent, struct v4l2_subdev, entity) #define vdev_to_v4l2_subdev(vdev) \ |