OSDN Git Service

media: staging: rkisp1: stats: don't set stats flags in rkisp1_stats_send_measurement
authorDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Sat, 9 May 2020 15:29:04 +0000 (17:29 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 23 Jun 2020 11:15:18 +0000 (13:15 +0200)
The flags that indicate which statistics are read are already
set in the functions that read them so there is no need to
set them in the function rkisp1_stats_send_measurement.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/rkisp1/rkisp1-stats.c

index 8351bda..0616793 100644 (file)
@@ -356,26 +356,19 @@ rkisp1_stats_send_measurement(struct rkisp1_stats *stats,
        cur_stat_buf =
                (struct rkisp1_stat_buffer *)(cur_buf->vaddr[0]);
 
-       if (meas_work->isp_ris & RKISP1_CIF_ISP_AWB_DONE) {
+       if (meas_work->isp_ris & RKISP1_CIF_ISP_AWB_DONE)
                rkisp1_stats_get_awb_meas(stats, cur_stat_buf);
-               cur_stat_buf->meas_type |= RKISP1_CIF_ISP_STAT_AWB;
-       }
 
-       if (meas_work->isp_ris & RKISP1_CIF_ISP_AFM_FIN) {
+       if (meas_work->isp_ris & RKISP1_CIF_ISP_AFM_FIN)
                rkisp1_stats_get_afc_meas(stats, cur_stat_buf);
-               cur_stat_buf->meas_type |= RKISP1_CIF_ISP_STAT_AFM_FIN;
-       }
 
        if (meas_work->isp_ris & RKISP1_CIF_ISP_EXP_END) {
                rkisp1_stats_get_aec_meas(stats, cur_stat_buf);
                rkisp1_stats_get_bls_meas(stats, cur_stat_buf);
-               cur_stat_buf->meas_type |= RKISP1_CIF_ISP_STAT_AUTOEXP;
        }
 
-       if (meas_work->isp_ris & RKISP1_CIF_ISP_HIST_MEASURE_RDY) {
+       if (meas_work->isp_ris & RKISP1_CIF_ISP_HIST_MEASURE_RDY)
                rkisp1_stats_get_hst_meas(stats, cur_stat_buf);
-               cur_stat_buf->meas_type |= RKISP1_CIF_ISP_STAT_HIST;
-       }
 
        vb2_set_plane_payload(&cur_buf->vb.vb2_buf, 0,
                              sizeof(struct rkisp1_stat_buffer));