From f120095d8882a83912dee3c80e06e0db24e1a14f Mon Sep 17 00:00:00 2001 From: Sunmi Lee Date: Thu, 28 Jun 2018 18:18:39 +0900 Subject: [PATCH] [COMMON] fimc-is2: Simplified the name of variables related to djag - djag_input_source -> djag_in - djag_contents -> djag Change-Id: I561132a5dd65eb7bdf166b339a739bad2ed0d4e0 Signed-off-by: Sunmi Lee --- .../exynos/fimc-is2/hardware/fimc-is-hw-djag.c | 16 ++++++++-------- .../fimc-is2/hardware/fimc-is-hw-mcscaler-v2.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c index db1cb73c9e4e..e2714334f6cc 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-djag.c @@ -117,15 +117,15 @@ int fimc_is_hw_mcsc_update_djag_register(struct fimc_is_hw_ip *hw_ip, hw_mcsc = (struct fimc_is_hw_mcsc *)hw_ip->priv_info; - backup_in = hw_mcsc->djag_input_source; + backup_in = hw_mcsc->djag_in; if (hw_ip->hardware->video_mode) - hw_mcsc->djag_input_source = DEV_HW_MCSC0; + hw_mcsc->djag_in = DEV_HW_MCSC0; else - hw_mcsc->djag_input_source = DEV_HW_MCSC1; + hw_mcsc->djag_in = DEV_HW_MCSC1; - if (backup_in != hw_mcsc->djag_input_source) + if (backup_in != hw_mcsc->djag_in) sdbg_hw(0, "djag input_source changed %d-> %d\n", hw_ip, - backup_in - DEV_HW_MCSC0, hw_mcsc->djag_input_source - DEV_HW_MCSC0); + backup_in - DEV_HW_MCSC0, hw_mcsc->djag_in - DEV_HW_MCSC0); #ifdef ENABLE_DJAG_IN_MCSC param->input.djag_out_width = 0; @@ -133,9 +133,9 @@ int fimc_is_hw_mcsc_update_djag_register(struct fimc_is_hw_ip *hw_ip, #endif fimc_is_scaler_set_djag_input_source(hw_ip->regs, - hw_mcsc->djag_input_source - DEV_HW_MCSC0); + hw_mcsc->djag_in - DEV_HW_MCSC0); - if (hw_mcsc->djag_input_source != hw_ip->id) + if (hw_mcsc->djag_in != hw_ip->id) return ret; sensor_position = hw_ip->hardware->sensor_position[instance]; @@ -197,7 +197,7 @@ int fimc_is_hw_mcsc_update_djag_register(struct fimc_is_hw_ip *hw_ip, fimc_is_scaler_set_djag_round_mode(hw_ip->regs, 1); #ifdef MCSC_USE_DEJAG_TUNING_PARAM - djag_tuneset = &hw_mcsc->applied_setfile[sensor_position]->djag_contents[scale_index]; + djag_tuneset = &hw_mcsc->applied_setfile[sensor_position]->djag[scale_index]; #endif fimc_is_scaler_set_djag_tunning_param(hw_ip->regs, djag_tuneset); 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 f764e14383e5..8e12017fb802 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 @@ -104,7 +104,7 @@ struct hw_api_scaler_setfile { * 2 : Scaling ratio = x1.5~x2.0 * 3 : Scaling ratio = x2.1~ */ - struct djag_setfile_contents djag_contents[MAX_SCALINGRATIOINDEX_DEPENDED_CONFIGS]; + struct djag_setfile_contents djag[MAX_SCALINGRATIOINDEX_DEPENDED_CONFIGS]; #endif }; @@ -163,8 +163,8 @@ struct fimc_is_hw_mcsc { struct tdnr_configs tdnr_cfgs; /* for Djag */ - u32 djag_input_source; - struct djag_setfile_contents djag_tunecfg; + u32 djag_in; + struct djag_setfile_contents djag_tunecfg; /* for full otf overflow recovery */ struct is_param_region *back_param; -- 2.20.1