| Message ID | 20200707171549.29601-1-dafna.hirschfeld@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: staging: rkisp1: rename RKISP1_CIF_ISP_STAT_AFM_FIN to RKISP1_CIF_ISP_STAT_AFM | expand |
Hi Dafna, On 7/7/20 2:15 PM, Dafna Hirschfeld wrote: > 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. I would just clarify that _FIN is used in RKISP1_CIF_ISP_AFM_FIN, which is an interruption indicating that that the hardware finished collecting auto-focus measurement, and RKISP1_CIF_ISP_STAT_AFM is a flag sent to userspace to indicate data contained in the buffer. With this: Acked-by: Helen Koike <helen.koike@collabora.com> Thanks Helen > > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > --- > drivers/staging/media/rkisp1/rkisp1-stats.c | 2 +- > 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 0616793ae395..b2a77ec21989 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-stats.c > +++ b/drivers/staging/media/rkisp1/rkisp1-stats.c > @@ -253,7 +253,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 ec624f2579cd..57f5035d62a4 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 { >
diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c index 0616793ae395..b2a77ec21989 100644 --- a/drivers/staging/media/rkisp1/rkisp1-stats.c +++ b/drivers/staging/media/rkisp1/rkisp1-stats.c @@ -253,7 +253,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 ec624f2579cd..57f5035d62a4 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 {
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> --- drivers/staging/media/rkisp1/rkisp1-stats.c | 2 +- drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)