update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/rockchip/isp/isp_stats_v2x.h
..
..
@@ -4,7 +4,7 @@
4
4
 #ifndef _RKISP_ISP_STATS_V2X_H
5
5
 #define _RKISP_ISP_STATS_V2X_H
6
6
 
7
-#include <linux/rkisp1-config.h>
7
+#include <linux/rk-isp1-config.h>
8
8
 #include <linux/interrupt.h>
9
9
 #include <linux/kfifo.h>
10
10
 #include "common.h"
..
..
@@ -16,38 +16,38 @@
16
16
 struct rkisp_stats_v2x_ops {
17
17
 	void (*get_siawb_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
18
18
 			       struct rkisp_isp2x_stat_buffer *pbuf);
19
-	int (*get_rawawb_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
20
-			       struct rkisp_isp2x_stat_buffer *pbuf);
19
+	void (*get_rawawb_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
20
+				struct rkisp_isp2x_stat_buffer *pbuf);
21
21
 
22
22
 	void (*get_siaf_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
23
23
 			      struct rkisp_isp2x_stat_buffer *pbuf);
24
-	int (*get_rawaf_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
25
-			      struct rkisp_isp2x_stat_buffer *pbuf);
24
+	void (*get_rawaf_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
25
+			       struct rkisp_isp2x_stat_buffer *pbuf);
26
26
 
27
-	int (*get_yuvae_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
28
-			      struct rkisp_isp2x_stat_buffer *pbuf);
27
+	void (*get_yuvae_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
28
+			       struct rkisp_isp2x_stat_buffer *pbuf);
29
29
 	void (*get_sihst_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
30
30
 			       struct rkisp_isp2x_stat_buffer *pbuf);
31
31
 
32
-	int (*get_rawae0_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
33
-			       struct rkisp_isp2x_stat_buffer *pbuf);
34
-	int (*get_rawhst0_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
32
+	void (*get_rawae0_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
35
33
 				struct rkisp_isp2x_stat_buffer *pbuf);
34
+	void (*get_rawhst0_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
35
+				 struct rkisp_isp2x_stat_buffer *pbuf);
36
36
 
37
-	int (*get_rawae1_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
38
-			       struct rkisp_isp2x_stat_buffer *pbuf);
39
-	int (*get_rawhst1_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
37
+	void (*get_rawae1_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
40
38
 				struct rkisp_isp2x_stat_buffer *pbuf);
39
+	void (*get_rawhst1_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
40
+				 struct rkisp_isp2x_stat_buffer *pbuf);
41
41
 
42
-	int (*get_rawae2_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
43
-			       struct rkisp_isp2x_stat_buffer *pbuf);
44
-	int (*get_rawhst2_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
42
+	void (*get_rawae2_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
45
43
 				struct rkisp_isp2x_stat_buffer *pbuf);
44
+	void (*get_rawhst2_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
45
+				 struct rkisp_isp2x_stat_buffer *pbuf);
46
46
 
47
-	int (*get_rawae3_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
48
-			       struct rkisp_isp2x_stat_buffer *pbuf);
49
-	int (*get_rawhst3_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
47
+	void (*get_rawae3_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
50
48
 				struct rkisp_isp2x_stat_buffer *pbuf);
49
+	void (*get_rawhst3_meas)(struct rkisp_isp_stats_vdev *stats_vdev,
50
+				 struct rkisp_isp2x_stat_buffer *pbuf);
51
51
 
52
52
 	void (*get_bls_stats)(struct rkisp_isp_stats_vdev *stats_vdev,
53
53
 			      struct rkisp_isp2x_stat_buffer *pbuf);