kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  * Samsung S5P Multi Format Codec v 5.0
3
4
  *
..
..
@@ -6,11 +7,6 @@
6
7
  *
7
8
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
8
9
  * Kamil Debski, <k.debski@samsung.com>
9
- *
10
- * This program is free software; you can redistribute it and/or modify
11
- * it under the terms of the GNU General Public License as published by the
12
- * Free Software Foundation; either version 2 of the
13
- * License, or (at your option) any later version
14
10
  */
15
11
 
16
12
 #ifndef S5P_MFC_COMMON_H_
..
..
@@ -268,7 +264,7 @@
268
264
  * @enc_ctrl_handler:	control framework handler for encoding
269
265
  * @pm:			power management control
270
266
  * @variant:		MFC hardware variant information
271
- * @num_inst:		couter of active MFC instances
267
+ * @num_inst:		counter of active MFC instances
272
268
  * @irqlock:		lock for operations on videobuf2 queues
273
269
  * @condlock:		lock for changing/checking if a context is ready to be
274
270
  *			processed
..
..
@@ -722,7 +718,6 @@
722
718
  *			used by the MFC
723
719
  */
724
720
 struct s5p_mfc_fmt {
725
-	char *name;
726
721
 	u32 fourcc;
727
722
 	u32 codec_mode;
728
723
 	enum s5p_mfc_fmt_type type;