kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/net/wireless/ath/ath10k/trace.h
..
..
@@ -1,18 +1,7 @@
1
+/* SPDX-License-Identifier: ISC */
1
2
 /*
2
3
  * Copyright (c) 2005-2011 Atheros Communications Inc.
3
4
  * Copyright (c) 2011-2016 Qualcomm Atheros, Inc.
4
- *
5
- * Permission to use, copy, modify, and/or distribute this software for any
6
- * purpose with or without fee is hereby granted, provided that the above
7
- * copyright notice and this permission notice appear in all copies.
8
- *
9
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16
5
  */
17
6
 
18
7
 #if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
..
..
@@ -40,7 +29,11 @@
40
29
 #if !defined(CONFIG_ATH10K_TRACING)
41
30
 #undef TRACE_EVENT
42
31
 #define TRACE_EVENT(name, proto, ...) \
43
-static inline void trace_ ## name(proto) {}
32
+static inline void trace_ ## name(proto) {} \
33
+static inline bool trace_##name##_enabled(void) \
34
+{						\
35
+	return false;				\
36
+}
44
37
 #undef DECLARE_EVENT_CLASS
45
38
 #define DECLARE_EVENT_CLASS(...)
46
39
 #undef DEFINE_EVENT
..
..
@@ -246,7 +239,7 @@
246
239
 	TP_STRUCT__entry(
247
240
 		__string(device, dev_name(ar->dev))
248
241
 		__string(driver, dev_driver_string(ar->dev))
249
-		__field(u8, hw_type);
242
+		__field(u8, hw_type)
250
243
 		__field(size_t, buf_len)
251
244
 		__dynamic_array(u8, buf, buf_len)
252
245
 	),
..
..
@@ -276,7 +269,7 @@
276
269
 	TP_STRUCT__entry(
277
270
 		__string(device, dev_name(ar->dev))
278
271
 		__string(driver, dev_driver_string(ar->dev))
279
-		__field(u8, hw_type);
272
+		__field(u8, hw_type)
280
273
 		__field(u16, buf_len)
281
274
 		__dynamic_array(u8, pktlog, buf_len)
282
275
 	),
..
..
@@ -442,7 +435,7 @@
442
435
 	TP_STRUCT__entry(
443
436
 		__string(device, dev_name(ar->dev))
444
437
 		__string(driver, dev_driver_string(ar->dev))
445
-		__field(u8, hw_type);
438
+		__field(u8, hw_type)
446
439
 		__field(u16, len)
447
440
 		__dynamic_array(u8, rxdesc, len)
448
441
 	),