[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>

2 files changed, 7 insertions, 21 deletions

diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 8fac8eaca51a..768356917bea 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 3250cc5e7925..bfda0fe9aeb0 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -586,15 +586,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) \