media: v4l2-subdev: drop extra #ifdef
authorTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tue, 12 Apr 2022 09:42:41 +0000 (10:42 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Sun, 24 Apr 2022 07:15:23 +0000 (08:15 +0100)
subdev_open() is inside #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API, which
depends on CONFIG_MEDIA_CONTROLLER, so there's no need for an extra

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/v4l2-core/v4l2-subdev.c

index 30eb504..2f24ef7 100644 (file)
@@ -63,7 +63,7 @@ static int subdev_open(struct file *file)
        v4l2_fh_init(&subdev_fh->vfh, vdev);
        v4l2_fh_add(&subdev_fh->vfh);
        file->private_data = &subdev_fh->vfh;
-#if defined(CONFIG_MEDIA_CONTROLLER)
+
        if (sd->v4l2_dev->mdev && sd->entity.graph_obj.mdev->dev) {
                struct module *owner;
 
@@ -74,7 +74,6 @@ static int subdev_open(struct file *file)
                }
                subdev_fh->owner = owner;
        }
-#endif
 
        if (sd->internal_ops && sd->internal_ops->open) {
                ret = sd->internal_ops->open(sd, subdev_fh);