update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/s3c-camif/camif-core.h
..
..
@@ -1,12 +1,9 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * s3c24xx/s3c64xx SoC series Camera Interface (CAMIF) driver
3
4
  *
4
5
  * Copyright (C) 2012 Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
5
6
  * Copyright (C) 2012 Tomasz Figa <tomasz.figa@gmail.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
10
7
 */
11
8
 
12
9
 #ifndef CAMIF_CORE_H_
..
..
@@ -92,7 +89,6 @@
92
89
  * @ybpp:      number of luminance bytes per pixel
93
90
  */
94
91
 struct camif_fmt {
95
-	char *name;
96
92
 	u32 fourcc;
97
93
 	u32 color;
98
94
 	u16 colplanes;
..
..
@@ -260,7 +256,7 @@
260
256
  * @clock:	  clocks required for the CAMIF operation
261
257
  * @lock:	  mutex protecting this data structure
262
258
  * @slock:	  spinlock protecting CAMIF registers
263
- * @io_base:	  start address of the mmaped CAMIF registers
259
+ * @io_base:	  start address of the mmapped CAMIF registers
264
260
  */
265
261
 struct camif_dev {
266
262
 	struct media_device		media_dev;