[media] media: add a linked list to track interfaces by mdev

The media device should list the interface objects, so add a linked list
for those interfaces in struct media_device.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 3e649cacfc075c01776149995b4e838fab5607a4..659507bce63f565703e41b36e087d857334d00b0 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -381,6 +381,7 @@ int __must_check __media_device_register(struct media_device *mdev,
                return -EINVAL;
 
        INIT_LIST_HEAD(&mdev->entities);
+       INIT_LIST_HEAD(&mdev->interfaces);
        spin_lock_init(&mdev->lock);
        mutex_init(&mdev->graph_mutex);
 

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index d15797e8a14216bf403c9130b0d623c116869c27..8449274bb50c97e2b87d4fbc809bc9ef001f0ab6 100644 (file)
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -849,6 +849,8 @@ static void media_interface_init(struct media_device *mdev,
        INIT_LIST_HEAD(&intf->links);
 
        media_gobj_init(mdev, gobj_type, &intf->graph_obj);
+
+       list_add_tail(&intf->list, &mdev->interfaces);
 }
 
 /* Functions related to the media interface via device nodes */
@@ -877,6 +879,7 @@ EXPORT_SYMBOL_GPL(media_devnode_create);
 void media_devnode_remove(struct media_intf_devnode *devnode)
 {
        media_gobj_remove(&devnode->intf.graph_obj);
+       list_del(&devnode->intf.list);
        kfree(devnode);
 }
 EXPORT_SYMBOL_GPL(media_devnode_remove);

diff --git a/include/media/media-device.h b/include/media/media-device.h
index 3b14394d570102a91c469b62eb68d10c2da53471..51807efa505b5b988d01bd69ed3e0f1e2aa646e6 100644 (file)
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -46,6 +46,7 @@ struct device;
  * @link_id:   Unique ID used on the last link registered
  * @intf_devnode_id: Unique ID used on the last interface devnode registered
  * @entities:  List of registered entities
+ * @interfaces:        List of registered interfaces
  * @lock:      Entities list lock
  * @graph_mutex: Entities graph operation lock
  * @link_notify: Link state change notification callback
@@ -77,6 +78,7 @@ struct media_device {
        u32 intf_devnode_id;
 
        struct list_head entities;
+       struct list_head interfaces;
 
        /* Protects the entities list */
        spinlock_t lock;

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index d64e8cb4de98e4fe15d0e4cf3678cb94b31985ab..ca35e07d9348c4dd20b6264d7d3f2d82567f4aaa 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -156,6 +156,8 @@ struct media_entity {
  * struct media_intf_devnode - Define a Kernel API interface
  *
  * @graph_obj:         embedded graph object
+ * @list:              Linked list used to find other interfaces that belong
+ *                     to the same media controller
  * @links:             List of links pointing to graph entities
  * @type:              Type of the interface as defined at the
  *                     uapi/media/media.h header, e. g.
@@ -164,6 +166,7 @@ struct media_entity {
  */
 struct media_interface {
        struct media_gobj               graph_obj;
+       struct list_head                list;
        struct list_head                links;
        u32                             type;
        u32                             flags;