media: exynos4-is: Remove inh_sensor_ctrls

This is a no-op as it is never set and is a remnant from non-DT days
that can be safely removed.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 73b632e..464a617 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -495,17 +495,6 @@ static int fimc_capture_open(struct file *file)
 
                ret = fimc_pipeline_call(ve, open, &ve->vdev.entity, true);
 
-               if (ret == 0 && vc->user_subdev_api && vc->inh_sensor_ctrls) {
-                       /*
-                        * Recreate controls of the the video node to drop
-                        * any controls inherited from the sensor subdev.
-                        */
-                       fimc_ctrls_delete(vc->ctx);
-
-                       ret = fimc_ctrls_create(vc->ctx);
-                       if (ret == 0)
-                               vc->inh_sensor_ctrls = false;
-               }
                if (ret == 0)
                        ve->vdev.entity.use_count++;
 
@@ -1398,7 +1387,7 @@ static int fimc_link_setup(struct media_entity *entity,
 
        vc->input = sd->grp_id;
 
-       if (vc->user_subdev_api || vc->inh_sensor_ctrls)
+       if (vc->user_subdev_api)
                return 0;
 
        /* Inherit V4L2 controls from the image sensor subdev. */

diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
index d130f66..31f81bc 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/drivers/media/platform/exynos4-is/fimc-core.h
@@ -299,8 +299,6 @@ struct fimc_m2m_device {
  * @input_index: input (camera sensor) index
  * @input: capture input type, grp_id of the attached subdev
  * @user_subdev_api: true if subdevs are not configured by the host driver
- * @inh_sensor_ctrls: a flag indicating v4l2 controls are inherited from
- *                   an image sensor subdev
  */
 struct fimc_vid_cap {
        struct fimc_ctx                 *ctx;
@@ -322,7 +320,6 @@ struct fimc_vid_cap {
        int                             input_index;
        u32                             input;
        bool                            user_subdev_api;
-       bool                            inh_sensor_ctrls;
 };
 
 /**