AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
..
..
@@ -1,22 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /******************************************************************************
2
3
  *
3
4
  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along with
15
- * this program; if not, write to the Free Software Foundation, Inc.,
16
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
17
- *
18
- * The full GNU General Public License is included in this distribution in the
19
- * file called LICENSE.
20
5
  *
21
6
  * Contact Information:
22
7
  *  Intel Linux Wireless <linuxwifi@intel.com>
..
..
@@ -69,18 +54,16 @@
69
54
 );
70
55
 
71
56
 TRACE_EVENT(iwlwifi_dbg,
72
-	TP_PROTO(u32 level, bool in_interrupt, const char *function,
57
+	TP_PROTO(u32 level, const char *function,
73
58
 		 struct va_format *vaf),
74
-	TP_ARGS(level, in_interrupt, function, vaf),
59
+	TP_ARGS(level, function, vaf),
75
60
 	TP_STRUCT__entry(
76
61
 		__field(u32, level)
77
-		__field(u8, in_interrupt)
78
62
 		__string(function, function)
79
63
 		__dynamic_array(char, msg, MAX_MSG_LEN)
80
64
 	),
81
65
 	TP_fast_assign(
82
66
 		__entry->level = level;
83
-		__entry->in_interrupt = in_interrupt;
84
67
 		__assign_str(function, function);
85
68
 		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
86
69
 				       MAX_MSG_LEN, vaf->fmt,