diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.c b/drivers/media/platform/rockchip/isp/isp_params_v1x.c index 6719422bf8ca..1a62bd278165 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v1x.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.c @@ -769,10 +769,6 @@ static void isp_aec_config_v12(struct rkisp_isp_params_vdev *params_vdev, static void isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev, const struct cifisp_cproc_config *arg) { - struct cifisp_isp_other_cfg *cur_other_cfg = - ¶ms_vdev->isp1x_params->others; - struct cifisp_ie_config *cur_ie_config = &cur_other_cfg->ie_config; - u32 effect = cur_ie_config->effect; u32 quantization = params_vdev->quantization; rkisp1_iowrite32(params_vdev, arg->contrast, CIF_C_PROC_CONTRAST); @@ -780,8 +776,7 @@ static void isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev, rkisp1_iowrite32(params_vdev, arg->sat, CIF_C_PROC_SATURATION); rkisp1_iowrite32(params_vdev, arg->brightness, CIF_C_PROC_BRIGHTNESS); - if (quantization != V4L2_QUANTIZATION_FULL_RANGE || - effect != V4L2_COLORFX_NONE) { + if (quantization != V4L2_QUANTIZATION_FULL_RANGE) { isp_param_clear_bits(params_vdev, CIF_C_PROC_CTRL, CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.c b/drivers/media/platform/rockchip/isp/isp_params_v21.c index a0741e5887ba..4cacb4a9a102 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v21.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -905,10 +905,6 @@ static void isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev, const struct isp2x_cproc_cfg *arg) { - struct isp21_isp_other_cfg *cur_other_cfg = - ¶ms_vdev->isp21_params->others; - struct isp2x_ie_cfg *cur_ie_config = &cur_other_cfg->ie_cfg; - u32 effect = cur_ie_config->effect; u32 quantization = params_vdev->quantization; rkisp_iowrite32(params_vdev, arg->contrast, CPROC_CONTRAST); @@ -916,8 +912,7 @@ isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev, rkisp_iowrite32(params_vdev, arg->sat, CPROC_SATURATION); rkisp_iowrite32(params_vdev, arg->brightness, CPROC_BRIGHTNESS); - if (quantization != V4L2_QUANTIZATION_FULL_RANGE || - effect != V4L2_COLORFX_NONE) { + if (quantization != V4L2_QUANTIZATION_FULL_RANGE) { isp_param_clear_bits(params_vdev, CPROC_CTRL, CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c index b3e0088e8174..5bb8043cc347 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v2x.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -954,10 +954,6 @@ static void isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev, const struct isp2x_cproc_cfg *arg) { - struct isp2x_isp_other_cfg *cur_other_cfg = - ¶ms_vdev->isp2x_params->others; - struct isp2x_ie_cfg *cur_ie_config = &cur_other_cfg->ie_cfg; - u32 effect = cur_ie_config->effect; u32 quantization = params_vdev->quantization; rkisp_iowrite32(params_vdev, arg->contrast, CPROC_CONTRAST); @@ -965,8 +961,7 @@ isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev, rkisp_iowrite32(params_vdev, arg->sat, CPROC_SATURATION); rkisp_iowrite32(params_vdev, arg->brightness, CPROC_BRIGHTNESS); - if (quantization != V4L2_QUANTIZATION_FULL_RANGE || - effect != V4L2_COLORFX_NONE) { + if (quantization != V4L2_QUANTIZATION_FULL_RANGE) { isp_param_clear_bits(params_vdev, CPROC_CTRL, CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL |