media: staging: rkisp1: use a macro for the statistics flags mask

The mask of the ready statistics flags is used in
several places in the code using bitwise-or.
Use a macro for that to make the code more readable.

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>

diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
index a9ede3f71ff33cd8da991e6619a8da98b917c882..43fe4dc2c7c489609583f39ecb33e7809a74a0f9 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-common.h
+++ b/drivers/staging/media/rkisp1/rkisp1-common.h
@@ -45,6 +45,10 @@
 
 #define RKISP1_MAX_BUS_CLK     8
 
+#define RKISP1_STATS_MEAS_MASK         (RKISP1_CIF_ISP_AWB_DONE |      \
+                                        RKISP1_CIF_ISP_AFM_FIN |       \
+                                        RKISP1_CIF_ISP_EXP_END |       \
+                                        RKISP1_CIF_ISP_HIST_MEASURE_RDY)
 enum rkisp1_rsz_pad {
        RKISP1_RSZ_PAD_SINK,
        RKISP1_RSZ_PAD_SRC,

diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
index 76229ecbc41aa1499e203f492c2b4c1ec27a4375..6ec1e9816e9f29e1b8f6aef3e76745c325f2a12c 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-isp.c
+++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
@@ -1139,10 +1139,7 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
 
                /* New frame from the sensor received */
                isp_ris = rkisp1_read(rkisp1, RKISP1_CIF_ISP_RIS);
-               if (isp_ris & (RKISP1_CIF_ISP_AWB_DONE |
-                              RKISP1_CIF_ISP_AFM_FIN |
-                              RKISP1_CIF_ISP_EXP_END |
-                              RKISP1_CIF_ISP_HIST_MEASURE_RDY))
+               if (isp_ris & RKISP1_STATS_MEAS_MASK)
                        rkisp1_stats_isr(&rkisp1->stats, isp_ris);
        }
 

diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c
index 0616793ae39589f2f3a8d4483d36b16789b1ea8a..b19a6d9cdd4daa4b26f36555098b41b1f4091dce 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-stats.c
+++ b/drivers/staging/media/rkisp1/rkisp1-stats.c
@@ -396,26 +396,18 @@ void rkisp1_stats_isr(struct rkisp1_stats *stats, u32 isp_ris)
        struct rkisp1_device *rkisp1 = stats->rkisp1;
        struct rkisp1_isp_readout_work *work;
        unsigned int isp_mis_tmp = 0;
-       u32 val;
 
        spin_lock(&stats->irq_lock);
 
-       val = RKISP1_CIF_ISP_AWB_DONE | RKISP1_CIF_ISP_AFM_FIN |
-             RKISP1_CIF_ISP_EXP_END | RKISP1_CIF_ISP_HIST_MEASURE_RDY;
-       rkisp1_write(rkisp1, val, RKISP1_CIF_ISP_ICR);
+       rkisp1_write(rkisp1, RKISP1_STATS_MEAS_MASK, RKISP1_CIF_ISP_ICR);
 
        isp_mis_tmp = rkisp1_read(rkisp1, RKISP1_CIF_ISP_MIS);
-       if (isp_mis_tmp &
-           (RKISP1_CIF_ISP_AWB_DONE | RKISP1_CIF_ISP_AFM_FIN |
-            RKISP1_CIF_ISP_EXP_END | RKISP1_CIF_ISP_HIST_MEASURE_RDY))
+       if (isp_mis_tmp & RKISP1_STATS_MEAS_MASK)
                rkisp1->debug.stats_error++;
 
        if (!stats->is_streaming)
                goto unlock;
-       if (isp_ris & (RKISP1_CIF_ISP_AWB_DONE |
-                      RKISP1_CIF_ISP_AFM_FIN |
-                      RKISP1_CIF_ISP_EXP_END |
-                      RKISP1_CIF_ISP_HIST_MEASURE_RDY)) {
+       if (isp_ris & RKISP1_STATS_MEAS_MASK) {
                work = kzalloc(sizeof(*work), GFP_ATOMIC);
                if (work) {
                        INIT_WORK(&work->work,