From: Sunmi Lee Date: Tue, 3 Jul 2018 00:35:55 +0000 (+0900) Subject: [COMMON] fimc-is2: Changed the name of variables of noise_index X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d7d37d046a502d30e04c2e067e2d67ef235061c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] fimc-is2: Changed the name of variables of noise_index cur_noise_index -> cur_ni PR JIRA ID: CPR-25 Change-Id: I97996e8612762cd4dc171d50cc4051b4866651ee Signed-off-by: Sunmi Lee --- diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.h b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.h index 64da6b62e387..f1b59f4ca11b 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.h +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.h @@ -177,7 +177,7 @@ struct fimc_is_hw_mcsc { ulong out_en; /* This flag save whether the capture video node of MCSC is opened or not. */ u32 prev_hwfc_output_ids; /* noise_index also needs to use in TDNR, CAC, DJAG */ - u32 cur_noise_index; + u32 cur_ni; /* for tdnr use */ enum mcsc_output_index tdnr_output; diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v1.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v1.c index 6bd746a88c58..f51f482c12aa 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v1.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v1.c @@ -924,7 +924,7 @@ static int fimc_is_hw_mcsc_cfg_tdnr_tuning_param(struct fimc_is_hw_ip *hw_ip, noise_index = frame->noise_idx; /* get applying NI from frame */ #endif - if (!start_flag && hw_mcsc->cur_noise_index == noise_index) + if (!start_flag && hw_mcsc->cur_ni == noise_index) goto exit; /* find ref NI arry index for re-configure NI depended settings */ @@ -988,7 +988,7 @@ config: tdnr_cfgs.spatial_dep_cfg, tdnr_cfgs.spatial_indep_cfg); exit: - hw_mcsc->cur_noise_index = noise_index; + hw_mcsc->cur_ni = noise_index; return ret; } diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v2.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v2.c index fd24efa8717b..fe7ce9b70f04 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v2.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tdnr-v2.c @@ -857,7 +857,7 @@ static int fimc_is_hw_mcsc_cfg_tdnr_tuning_param(struct fimc_is_hw_ip *hw_ip, noise_index = frame->noise_idx; /* get applying NI from frame */ #endif - if (!start_flag && hw_mcsc->cur_noise_index == noise_index) + if (!start_flag && hw_mcsc->cur_ni == noise_index) goto exit; /* find ref NI arry index for re-configure NI depended settings */ @@ -921,7 +921,7 @@ config: tdnr_cfgs.spatial_dep_cfg, tdnr_cfgs.spatial_indep_cfg); exit: - hw_mcsc->cur_noise_index = noise_index; + hw_mcsc->cur_ni = noise_index; return ret; }