[media] v4l: Make v4l2_subdev inherit from media_entity

V4L2 subdevices are media entities. As such they need to inherit from
(include) the media_entity structure.

When registering/unregistering the subdevice, the media entity is
automatically registered/unregistered. The entity is acquired on device
open and released on device close.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 32 insertions, 4 deletions

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index cfbd8a38991d..a1afda352d08 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -118,8 +118,11 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
 EXPORT_SYMBOL_GPL(v4l2_device_unregister);
 
 int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
-                                                struct v4l2_subdev *sd)
+                                struct v4l2_subdev *sd)
 {
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        struct media_entity *entity = &sd->entity;
+#endif
         int err;
 
         /* Check for valid input */
@@ -147,6 +150,19 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
                 return err;
         }
 
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        /* Register the entity. */
+        if (v4l2_dev->mdev) {
+                err = media_device_register_entity(v4l2_dev->mdev, entity);
+                if (err < 0) {
+                        if (sd->internal_ops && sd->internal_ops->unregistered)
+                                sd->internal_ops->unregistered(sd);
+                        module_put(sd->owner);
+                        return err;
+                }
+        }
+#endif
+
         spin_lock(&v4l2_dev->lock);
         list_add_tail(&sd->list, &v4l2_dev->subdevs);
         spin_unlock(&v4l2_dev->lock);
@@ -177,25 +193,37 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                                               sd->owner);
                 if (err < 0)
                         return err;
+#if defined(CONFIG_MEDIA_CONTROLLER)
+                sd->entity.v4l.major = VIDEO_MAJOR;
+                sd->entity.v4l.minor = vdev->minor;
+#endif
         }
-
         return 0;
 }
 EXPORT_SYMBOL_GPL(v4l2_device_register_subdev_nodes);
 
 void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
 {
+        struct v4l2_device *v4l2_dev;
+
         /* return if it isn't registered */
         if (sd == NULL || sd->v4l2_dev == NULL)
                 return;
 
-        spin_lock(&sd->v4l2_dev->lock);
+        v4l2_dev = sd->v4l2_dev;
+
+        spin_lock(&v4l2_dev->lock);
         list_del(&sd->list);
-        spin_unlock(&sd->v4l2_dev->lock);
+        spin_unlock(&v4l2_dev->lock);
+
         if (sd->internal_ops && sd->internal_ops->unregistered)
                 sd->internal_ops->unregistered(sd);
         sd->v4l2_dev = NULL;
 
+#if defined(CONFIG_MEDIA_CONTROLLER)
+        if (v4l2_dev->mdev)
+                media_device_unregister_entity(&sd->entity);
+#endif
         video_unregister_device(&sd->devnode);
         module_put(sd->owner);
 }