update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/i2c/nvp6158_drv/nvp6158_dev.c
..
..
@@ -83,7 +83,7 @@
83
83
 }
84
84
 
85
85
 static int nvp6158_restore(struct himedia_device* pdev)
86
-{  
86
+{
87
87
     printk(KERN_ALERT "%s  %d\n", __FUNCTION__, __LINE__);
88
88
     return 0;
89
89
 }
..
..
@@ -91,7 +91,7 @@
91
91
 
92
92
 static const struct file_operations nvp6158_fops = {
93
93
 	.owner      = THIS_MODULE,
94
-    .unlocked_ioctl	= nvp6158_native_ioctl,
94
+    	.unlocked_ioctl	= nvp6158_native_ioctl,
95
95
 	.open       = nvp6158_open,
96
96
 	.release    = nvp6158_close,
97
97
 };
..
..
@@ -122,25 +122,21 @@
122
122
 	unsigned char ch = 0;
123
123
 
124
124
 	memset(&s_nvp6158_vfmts, 0, sizeof(NVP6158_INFORMATION_S));
125
-	
126
-	while(!kthread_should_stop())
127
-	{
125
+
126
+	while(!kthread_should_stop()) {
128
127
 		#if 1  //standard rutine of a process
129
128
 		down(&nvp6158_lock);
130
129
 		ch = ch % (nvp6158_cnt*4);
131
130
 		nvp6158_getvideoloss();
132
-		if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
133
-		{
131
+		if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID) {
134
132
 			nvp6158_video_fmt_det(ch, &s_nvp6158_vfmts);
135
133
 			curfmt = s_nvp6158_vfmts.curvideofmt[ch];
136
134
 			prefmt = s_nvp6158_vfmts.prevideofmt[ch];
137
135
 			chvloss = s_nvp6158_vfmts.curvideoloss[ch];
138
136
 			//printk(">>>>>>%s CH[%d] chvloss = %d curfmt = %x prefmt = %x\n", __func__, ch, chvloss, curfmt, prefmt);
139
137
 
140
-			if(chvloss == 0x00)
141
-			{	
142
-				if(nvp6158_ch_mode_status[ch] != prefmt)
143
-				{
138
+			if(chvloss == 0x00) {	
139
+				if(nvp6158_ch_mode_status[ch] != prefmt) {
144
140
 					nvp6158_set_chnmode(ch, curfmt);
145
141
 					nvp6158_set_portmode(0, ch%4, NVP6158_OUTMODE_1MUX_FHD, ch%4);
146
142
 					s_eq_info.Ch = ch%4;
..
..
@@ -148,32 +144,26 @@
148
144
 					s_eq_info.FmtDef = curfmt;
149
145
 					nvp6158_get_eq_dist(&s_eq_info);
150
146
 					s_nvp6158_vfmts.prevideofmt[ch] = curfmt;
151
-					printk(">>>>>>%s CH[%d] s_eq_info.distance = %d\n", __func__, ch, s_eq_info.distance);
147
+					printk(">>>>>>%s CH[%d] s_eq_info.distance = %d\n",
148
+						__func__, ch, s_eq_info.distance);
152
149
 					nvp6158_set_equalizer(&s_eq_info);
153
150
 					
154
151
 				}
155
-			}
156
-			else
157
-			{	
158
-				if(nvp6158_ch_mode_status[ch] != NC_VIVO_CH_FORMATDEF_UNKNOWN)
159
-				{
152
+			} else {	
153
+				if(nvp6158_ch_mode_status[ch] != NC_VIVO_CH_FORMATDEF_UNKNOWN) {
160
154
 					nvp6158_set_chnmode(ch, NC_VIVO_CH_FORMATDEF_UNKNOWN);
161
155
 					nvp6158_set_portmode(0, ch%4, NVP6158_OUTMODE_1MUX_FHD, ch%4);
162
156
 				}
163
-			}	
164
-		}
165
-		else
166
-		{
157
+			}
158
+		} else {
167
159
 			nvp6168_video_fmt_det(ch, &s_nvp6158_vfmts);
168
160
 			curfmt = s_nvp6158_vfmts.curvideofmt[ch];
169
161
 			prefmt = s_nvp6158_vfmts.prevideofmt[ch];
170
162
 			chvloss = s_nvp6158_vfmts.curvideoloss[ch];
171
163
 			//printk(">>>>>>%s CH[%d] chvloss = %d curfmt = %x prefmt = %x nvp6158_ch_mode_status[%d]=%x\n", __func__, ch, chvloss, curfmt, prefmt, ch, nvp6158_ch_mode_status[ch]);
172
-			
173
-			if(chvloss == 0x00)
174
-			{	
175
-				if(nvp6158_ch_mode_status[ch] != prefmt)
176
-				{
164
+
165
+			if(chvloss == 0x00) {
166
+				if(nvp6158_ch_mode_status[ch] != prefmt) {
177
167
 					nvp6168_set_chnmode(ch, curfmt);
178
168
 					nvp6158_set_portmode(0, ch%4, NVP6158_OUTMODE_1MUX_FHD, ch%4);
179
169
 					s_eq_info.Ch = ch%4;
..
..
@@ -184,16 +174,13 @@
184
174
 					printk(">>>>>>%s CH[%d] s_eq_info.distance = %d\n", __func__, ch, s_eq_info.distance);
185
175
 					nvp6168_set_equalizer(&s_eq_info);
186
176
 				}
187
-			}
188
-			else
189
-			{	
190
-				if(nvp6158_ch_mode_status[ch] != NC_VIVO_CH_FORMATDEF_UNKNOWN)
191
-				{
177
+			} else {
178
+				if(nvp6158_ch_mode_status[ch] != NC_VIVO_CH_FORMATDEF_UNKNOWN) {
192
179
 					nvp6168_set_chnmode(ch, NC_VIVO_CH_FORMATDEF_UNKNOWN);
193
180
 					nvp6158_set_portmode(0, ch%4, NVP6158_OUTMODE_1MUX_FHD, ch%4);
194
181
 				}
195
-			}	
196
-		}	
182
+			}
183
+		}
197
184
 		ch ++;
198
185
 		up(&nvp6158_lock);
199
186
 		#endif
..
..
@@ -234,23 +221,21 @@
234
221
 	int ret = 0;
235
222
 	//char entry[20];
236
223
 #ifdef CONFIG_HISI_SNAPSHOT_BOOT
237
-    snprintf(s_stNvp6158Device.devfs_name, sizeof(s_stNvp6158Device.devfs_name), DEV_NAME);
238
-    s_stNvp6158Device.minor  = HIMEDIA_DYNAMIC_MINOR;
239
-    s_stNvp6158Device.fops   = &nvp6158_fops;
240
-    s_stNvp6158Device.drvops = &stNvp6158DrvOps;
241
-    s_stNvp6158Device.owner  = THIS_MODULE;
224
+	snprintf(s_stNvp6158Device.devfs_name, sizeof(s_stNvp6158Device.devfs_name), DEV_NAME);
225
+	s_stNvp6158Device.minor  = HIMEDIA_DYNAMIC_MINOR;
226
+	s_stNvp6158Device.fops   = &nvp6158_fops;
227
+	s_stNvp6158Device.drvops = &stNvp6158DrvOps;
228
+	s_stNvp6158Device.owner  = THIS_MODULE;
242
229
 
243
-    ret = himedia_register(&s_stNvp6158Device);
244
-    if (ret)
245
-    {
246
-        printk(0, "could not register nvp6158_dev device");
247
-        return -1;
248
-    }
230
+	ret = himedia_register(&s_stNvp6158Device);
231
+	if (ret) {
232
+		printk(0, "could not register nvp6158_dev device");
233
+		return -1;
234
+ 	}
249
235
 #else
250
236
 	ret = misc_register(&nvp6158_dev);
251
-   	if (ret)
252
-	{
253
-		printk("ERROR: could not register nvp6158_dev devices:%#x \n",ret);		
237
+   	if (ret) {
238
+		printk("ERROR: could not register nvp6158_dev devices:%#x \n",ret);
254
239
         	return -1;
255
240
 	}
256
241
 #endif
..
..
@@ -258,8 +243,7 @@
258
243
 #ifdef STREAM_ON_DEFLAULT
259
244
 	//printk("NVP6158/68(C) ex Driver %s COMPILE TIME[%s %s]\n", NVP6158_DRIVER_VER, __DATE__,__TIME__);
260
245
 	nvp6158_init(I2C_1);
261
-	if (ret)
262
-	{
246
+	if (ret) {
263
247
 		printk(KERN_ERR "ERROR: jaguar1 init failed\n");
264
248
 		return -1;
265
249
 	}
..
..
@@ -267,18 +251,17 @@
267
251
 	nvp6158_video_decoder_init();
268
252
 	/* initialize Audio
269
253
 	 * recmaster, pbmaster, ch_num, samplerate, bits */
270
-	if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
271
-		nvp6158_audio_init(1,0,16,0,0);
254
+	if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID)
255
+		nvp6158_audio_init(1, 0, 16, 0, 0);
272
256
 	else
273
-		nvp6168_audio_init(1,0,16,0,0);
257
+		nvp6168_audio_init(1, 0, 16, 0, 0);
274
258
 	//VDO_1/2 enable, VCLK_x ebable
275
259
 	gpio_i2c_write(0x60, 0xFF, 0x01);
276
260
 	gpio_i2c_write(0x60, 0xCA, 0x66);
277
261
 	up(&nvp6158_lock);
278
262
 
279
263
 	/* create kernel thread for EQ, But Now not used. */
280
-	if(nvp6158_kthread == 1)
281
-	{
264
+	if(nvp6158_kthread == 1) {
282
265
 		nvp6158_kt = kthread_create(nvp6158_kernel_thread, NULL, "nvp6158_kt");
283
266
 	    	if(!IS_ERR(nvp6158_kt))
284
267
 	       		wake_up_process(nvp6158_kt);
..
..
@@ -309,7 +292,7 @@
309
292
 	himedia_unregister(&s_stNvp6158Device);
310
293
 #else
311
294
 	misc_deregister(&nvp6158_dev);
312
-#endif	
295
+#endif
313
296
 	nvp6158_i2c_client_exit();
314
297
 	//printk("NVP6158(C) ex Driver %s COMPILE TIME[%s %s] removed\n", NVP6158_DRIVER_VER, __DATE__,__TIME__);
315
298
 }