diff options
| author | Dafna Hirschfeld <dafna.hirschfeld@collabora.com> | 2020-08-06 13:50:32 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-08-29 08:25:38 +0200 |
| commit | c0665297553272beba9342bb49e4687a5a2445d7 (patch) | |
| tree | 4515ebc7d716cd511403aa429be713834fc20599 | |
| parent | 14ba397f22f849936ef59690ff8b005f8f7f72e6 (diff) | |
| download | linux-c0665297553272beba9342bb49e4687a5a2445d7.tar.bz2 | |
media: staging: rkisp1: rename RKISP1_CIF_ISP_STAT_AFM_FIN to RKISP1_CIF_ISP_STAT_AFM
The flag RKISP1_CIF_ISP_STAT_AFM_FIN indicates userspace
that auto-focus measurements were collected. Therefore
the suffix _FIN in the flag's name does not fit.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-stats.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c index c2415f6ebc13..43be7e53ef17 100644 --- a/drivers/staging/media/rkisp1/rkisp1-stats.c +++ b/drivers/staging/media/rkisp1/rkisp1-stats.c @@ -231,7 +231,7 @@ static void rkisp1_stats_get_afc_meas(struct rkisp1_stats *stats, struct rkisp1_device *rkisp1 = stats->rkisp1; struct rkisp1_cif_isp_af_stat *af; - pbuf->meas_type |= RKISP1_CIF_ISP_STAT_AFM_FIN; + pbuf->meas_type |= RKISP1_CIF_ISP_STAT_AFM; af = &pbuf->params.af; af->window[0].sum = rkisp1_read(rkisp1, RKISP1_CIF_ISP_AFM_SUM_A); diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h index e89ec359b537..76991b0073bb 100644 --- a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h +++ b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h @@ -113,7 +113,7 @@ */ #define RKISP1_CIF_ISP_STAT_AWB BIT(0) #define RKISP1_CIF_ISP_STAT_AUTOEXP BIT(1) -#define RKISP1_CIF_ISP_STAT_AFM_FIN BIT(2) +#define RKISP1_CIF_ISP_STAT_AFM BIT(2) #define RKISP1_CIF_ISP_STAT_HIST BIT(3) enum rkisp1_cif_isp_histogram_mode { |