update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/usb/stk1160/stk1160.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  * STK1160 driver
3
4
  *
..
..
@@ -7,17 +8,6 @@
7
8
  * Based on Easycap driver by R.M. Thomas
8
9
  *	Copyright (C) 2010 R.M. Thomas
9
10
  *	<rmthomas--a.t--sciolus.org>
10
- *
11
- * This program is free software; you can redistribute it and/or modify
12
- * it under the terms of the GNU General Public License as published by
13
- * the Free Software Foundation; either version 2 of the License, or
14
- * (at your option) any later version.
15
- *
16
- * This program is distributed in the hope that it will be useful,
17
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
- * GNU General Public License for more details.
20
- *
21
11
  */
22
12
 
23
13
 #include <linux/i2c.h>
..
..
@@ -112,7 +102,6 @@
112
102
 };
113
103
 
114
104
 struct stk1160_fmt {
115
-	char  *name;
116
105
 	u32   fourcc;          /* v4l2 format id */
117
106
 	int   depth;
118
107
 };
..
..
@@ -177,7 +166,7 @@
177
166
 int stk1160_vb2_setup(struct stk1160 *dev);
178
167
 int stk1160_video_register(struct stk1160 *dev);
179
168
 void stk1160_video_unregister(struct stk1160 *dev);
180
-void stk1160_clear_queue(struct stk1160 *dev);
169
+void stk1160_clear_queue(struct stk1160 *dev, enum vb2_buffer_state vb2_state);
181
170
 
182
171
 /* Provided by stk1160-video.c */
183
172
 int stk1160_alloc_isoc(struct stk1160 *dev);