2020-04-26 02:29:53

by Jonathan Bakker

Subject: [PATCH 08/11] 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 <[email protected]>
---
drivers/media/platform/exynos4-is/fimc-capture.c | 13 +------------
drivers/media/platform/exynos4-is/fimc-core.h | 3 ---
2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 86c233e2f2c9..95d4a667bffb 100644
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -492,17 +492,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++;

@@ -1408,7 +1397,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 d130f664a60b..31f81bcb8483 100644
--- 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;
};

/**
--
2.20.1

2020-07-07 18:38:52

by Tomasz Figa

Subject: Re: [PATCH 08/11] media: exynos4-is: Remove inh_sensor_ctrls

On Sat, Apr 25, 2020 at 07:26:47PM -0700, Jonathan Bakker wrote:
> 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 <[email protected]>
> ---
> drivers/media/platform/exynos4-is/fimc-capture.c | 13 +------------
> drivers/media/platform/exynos4-is/fimc-core.h | 3 ---
> 2 files changed, 1 insertion(+), 15 deletions(-)
>

Reviewed-by: Tomasz Figa <[email protected]>

Best regards,
Tomasz

2020-07-08 15:48:31

by Sylwester Nawrocki

Subject: Re: [PATCH 08/11] media: exynos4-is: Remove inh_sensor_ctrls

On 26.04.2020 04:26, Jonathan Bakker wrote:
> 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 <[email protected]>

Reviewed-by: Sylwester Nawrocki <[email protected]>