[lkml]   [2020]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[patch 28/35] net: iwlwifi: Remove in_interrupt() from tracing macro.
From: Sebastian Andrzej Siewior <>

The usage of in_interrupt) in driver code is phased out.

The iwlwifi_dbg tracepoint records in_interrupt() seperately, but that's
superfluous because the trace header already records all kind of state and
context information like hardirq status, softirq status, preemption count

Aside of that the recording of in_interrupt() as boolean does not allow to
distinguish between the possible contexts (hard interrupt, soft interrupt,
bottom half disabled) while the trace header gives precise information.

Remove the duplicate information from the tracepoint and fixup the caller.

Signed-off-by: Sebastian Andrzej Siewior <>
Signed-off-by: Thomas Gleixner <>
Cc: Johannes Berg <>
Cc: Emmanuel Grumbach <>
Cc: Luca Coelho <>
Cc: Intel Linux Wireless <>
Cc: Kalle Valo <>
Cc: "David S. Miller" <>
Cc: Jakub Kicinski <>

drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)

--- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
@@ -123,7 +123,7 @@ void __iwl_dbg(struct device *dev,
(!limit || net_ratelimit()))
dev_printk(KERN_DEBUG, dev, "%s %pV", function, &vaf);
- trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
+ trace_iwlwifi_dbg(level, function, &vaf);
--- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
@@ -54,18 +54,16 @@ DEFINE_EVENT(iwlwifi_msg_event, iwlwifi_

- TP_PROTO(u32 level, bool in_interrupt, const char *function,
+ TP_PROTO(u32 level, const char *function,
struct va_format *vaf),
- TP_ARGS(level, in_interrupt, function, vaf),
+ TP_ARGS(level, function, vaf),
__field(u32, level)
- __field(u8, in_interrupt)
__string(function, function)
__dynamic_array(char, msg, MAX_MSG_LEN)
__entry->level = level;
- __entry->in_interrupt = in_interrupt;
__assign_str(function, function);
MAX_MSG_LEN, vaf->fmt,
 \ /
  Last update: 2020-09-27 22:00    [W:0.181 / U:0.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site