diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-04-10 06:24:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 15:51:56 -0300 |
| commit | 3530ef0a6ea56636b23b5a15ff645632f7596c04 (patch) | |
| tree | 7e8e44a15f6241ebaf4ab377cf887ce10392a0d0 /drivers/media/platform/exynos4-is/fimc-is-regs.c | |
| parent | a6f5635e63ffa02c30a22ea4af21f3daa1e98cdf (diff) | |
[media] exynos4-is: Rename the ISP chain configuration data structure
More appropriate names for the ISP chain data structure.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-is-regs.c')
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-is-regs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.c b/drivers/media/platform/exynos4-is/fimc-is-regs.c index f59a289c530d..b0ff67bc1b05 100644 --- a/drivers/media/platform/exynos4-is/fimc-is-regs.c +++ b/drivers/media/platform/exynos4-is/fimc-is-regs.c @@ -79,18 +79,18 @@ int fimc_is_hw_wait_intmsr0_intmsd0(struct fimc_is *is) int fimc_is_hw_set_param(struct fimc_is *is) { - struct is_config_param *cfg = &is->cfg_param[is->scenario_id]; + struct chain_config *config = &is->config[is->config_index]; unsigned int param_count = __get_pending_param_count(is); fimc_is_hw_wait_intmsr0_intmsd0(is); mcuctl_write(HIC_SET_PARAMETER, is, MCUCTL_REG_ISSR(0)); mcuctl_write(is->sensor_index, is, MCUCTL_REG_ISSR(1)); - mcuctl_write(is->scenario_id, is, MCUCTL_REG_ISSR(2)); + mcuctl_write(is->config_index, is, MCUCTL_REG_ISSR(2)); mcuctl_write(param_count, is, MCUCTL_REG_ISSR(3)); - mcuctl_write(cfg->p_region_index1, is, MCUCTL_REG_ISSR(4)); - mcuctl_write(cfg->p_region_index2, is, MCUCTL_REG_ISSR(5)); + mcuctl_write(config->p_region_index1, is, MCUCTL_REG_ISSR(4)); + mcuctl_write(config->p_region_index2, is, MCUCTL_REG_ISSR(5)); fimc_is_hw_set_intgr0_gd0(is); return 0; @@ -174,10 +174,10 @@ int fimc_is_hw_change_mode(struct fimc_is *is) HIC_CAPTURE_STILL, HIC_CAPTURE_VIDEO, }; - if (WARN_ON(is->scenario_id > ARRAY_SIZE(cmd))) + if (WARN_ON(is->config_index > ARRAY_SIZE(cmd))) return -EINVAL; - mcuctl_write(cmd[is->scenario_id], is, MCUCTL_REG_ISSR(0)); + mcuctl_write(cmd[is->config_index], is, MCUCTL_REG_ISSR(0)); mcuctl_write(is->sensor_index, is, MCUCTL_REG_ISSR(1)); mcuctl_write(is->setfile.sub_index, is, MCUCTL_REG_ISSR(2)); fimc_is_hw_set_intgr0_gd0(is); @@ -238,6 +238,6 @@ int fimc_is_itf_mode_change(struct fimc_is *is) FIMC_IS_CONFIG_TIMEOUT); if (!ret < 0) dev_err(&is->pdev->dev, "%s(): mode change (%d) timeout\n", - __func__, is->scenario_id); + __func__, is->config_index); return ret; } |