1 files changed, 72 insertions, 69 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 96e62338cec0..06203d6a1d86 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -41,130 +41,134 @@ static inline void trace_ ## name(proto) {}
 static inline void trace_ ## name(proto) {}
 #endif
 
-#define PRIV_ENTRY      __field(void *, priv)
-#define PRIV_ASSIGN     __entry->priv = priv
+#define DEV_ENTRY       __string(dev, dev_name(dev))
+#define DEV_ASSIGN      __assign_str(dev, dev_name(dev))
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM iwlwifi_io
 
 TRACE_EVENT(iwlwifi_dev_ioread32,
-        TP_PROTO(void *priv, u32 offs, u32 val),
-        TP_ARGS(priv, offs, val),
+        TP_PROTO(const struct device *dev, u32 offs, u32 val),
+        TP_ARGS(dev, offs, val),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __field(u32, offs)
                 __field(u32, val)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->offs = offs;
                 __entry->val = val;
         ),
-        TP_printk("[%p] read io[%#x] = %#x", __entry->priv, __entry->offs, __entry->val)
+        TP_printk("[%s] read io[%#x] = %#x",
+                  __get_str(dev), __entry->offs, __entry->val)
 );
 
 TRACE_EVENT(iwlwifi_dev_iowrite8,
-        TP_PROTO(void *priv, u32 offs, u8 val),
-        TP_ARGS(priv, offs, val),
+        TP_PROTO(const struct device *dev, u32 offs, u8 val),
+        TP_ARGS(dev, offs, val),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __field(u32, offs)
                 __field(u8, val)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->offs = offs;
                 __entry->val = val;
         ),
-        TP_printk("[%p] write io[%#x] = %#x)", __entry->priv, __entry->offs, __entry->val)
+        TP_printk("[%s] write io[%#x] = %#x)",
+                  __get_str(dev), __entry->offs, __entry->val)
 );
 
 TRACE_EVENT(iwlwifi_dev_iowrite32,
-        TP_PROTO(void *priv, u32 offs, u32 val),
-        TP_ARGS(priv, offs, val),
+        TP_PROTO(const struct device *dev, u32 offs, u32 val),
+        TP_ARGS(dev, offs, val),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __field(u32, offs)
                 __field(u32, val)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->offs = offs;
                 __entry->val = val;
         ),
-        TP_printk("[%p] write io[%#x] = %#x)", __entry->priv, __entry->offs, __entry->val)
+        TP_printk("[%s] write io[%#x] = %#x)",
+                  __get_str(dev), __entry->offs, __entry->val)
 );
 
 TRACE_EVENT(iwlwifi_dev_irq,
-        TP_PROTO(void *priv),
-        TP_ARGS(priv),
+        TP_PROTO(const struct device *dev),
+        TP_ARGS(dev),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
         ),
         /* TP_printk("") doesn't compile */
         TP_printk("%d", 0)
 );
 
 TRACE_EVENT(iwlwifi_dev_ict_read,
-        TP_PROTO(void *priv, u32 index, u32 value),
-        TP_ARGS(priv, index, value),
+        TP_PROTO(const struct device *dev, u32 index, u32 value),
+        TP_ARGS(dev, index, value),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __field(u32, index)
                 __field(u32, value)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->index = index;
                 __entry->value = value;
         ),
-        TP_printk("read ict[%d] = %#.8x", __entry->index, __entry->value)
+        TP_printk("[%s] read ict[%d] = %#.8x",
+                  __get_str(dev), __entry->index, __entry->value)
 );
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM iwlwifi_ucode
 
 TRACE_EVENT(iwlwifi_dev_ucode_cont_event,
-        TP_PROTO(void *priv, u32 time, u32 data, u32 ev),
-        TP_ARGS(priv, time, data, ev),
+        TP_PROTO(const struct device *dev, u32 time, u32 data, u32 ev),
+        TP_ARGS(dev, time, data, ev),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
 
                 __field(u32, time)
                 __field(u32, data)
                 __field(u32, ev)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->time = time;
                 __entry->data = data;
                 __entry->ev = ev;
         ),
-        TP_printk("[%p] EVT_LOGT:%010u:0x%08x:%04u",
-                  __entry->priv, __entry->time, __entry->data, __entry->ev)
+        TP_printk("[%s] EVT_LOGT:%010u:0x%08x:%04u",
+                  __get_str(dev), __entry->time, __entry->data, __entry->ev)
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_wrap_event,
-        TP_PROTO(void *priv, u32 wraps, u32 n_entry, u32 p_entry),
-        TP_ARGS(priv, wraps, n_entry, p_entry),
+        TP_PROTO(const struct device *dev, u32 wraps, u32 n_entry, u32 p_entry),
+        TP_ARGS(dev, wraps, n_entry, p_entry),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
 
                 __field(u32, wraps)
                 __field(u32, n_entry)
                 __field(u32, p_entry)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->wraps = wraps;
                 __entry->n_entry = n_entry;
                 __entry->p_entry = p_entry;
         ),
-        TP_printk("[%p] wraps=#%02d n=0x%X p=0x%X",
-                  __entry->priv, __entry->wraps, __entry->n_entry,
+        TP_printk("[%s] wraps=#%02d n=0x%X p=0x%X",
+                  __get_str(dev), __entry->wraps, __entry->n_entry,
                   __entry->p_entry)
 );
 
@@ -232,52 +236,52 @@ TRACE_EVENT(iwlwifi_dbg,
 #define TRACE_SYSTEM iwlwifi
 
 TRACE_EVENT(iwlwifi_dev_hcmd,
-        TP_PROTO(void *priv, u32 flags,
+        TP_PROTO(const struct device *dev, u32 flags,
                  const void *hcmd0, size_t len0,
                  const void *hcmd1, size_t len1,
                  const void *hcmd2, size_t len2),
-        TP_ARGS(priv, flags, hcmd0, len0, hcmd1, len1, hcmd2, len2),
+        TP_ARGS(dev, flags, hcmd0, len0, hcmd1, len1, hcmd2, len2),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __dynamic_array(u8, hcmd0, len0)
                 __dynamic_array(u8, hcmd1, len1)
                 __dynamic_array(u8, hcmd2, len2)
                 __field(u32, flags)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 memcpy(__get_dynamic_array(hcmd0), hcmd0, len0);
                 memcpy(__get_dynamic_array(hcmd1), hcmd1, len1);
                 memcpy(__get_dynamic_array(hcmd2), hcmd2, len2);
                 __entry->flags = flags;
         ),
-        TP_printk("[%p] hcmd %#.2x (%ssync)",
-                  __entry->priv, ((u8 *)__get_dynamic_array(hcmd0))[0],
+        TP_printk("[%s] hcmd %#.2x (%ssync)",
+                  __get_str(dev), ((u8 *)__get_dynamic_array(hcmd0))[0],
                   __entry->flags & CMD_ASYNC ? "a" : "")
 );
 
 TRACE_EVENT(iwlwifi_dev_rx,
-        TP_PROTO(void *priv, void *rxbuf, size_t len),
-        TP_ARGS(priv, rxbuf, len),
+        TP_PROTO(const struct device *dev, void *rxbuf, size_t len),
+        TP_ARGS(dev, rxbuf, len),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __dynamic_array(u8, rxbuf, len)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 memcpy(__get_dynamic_array(rxbuf), rxbuf, len);
         ),
-        TP_printk("[%p] RX cmd %#.2x",
-                  __entry->priv, ((u8 *)__get_dynamic_array(rxbuf))[4])
+        TP_printk("[%s] RX cmd %#.2x",
+                  __get_str(dev), ((u8 *)__get_dynamic_array(rxbuf))[4])
 );
 
 TRACE_EVENT(iwlwifi_dev_tx,
-        TP_PROTO(void *priv, void *tfd, size_t tfdlen,
+        TP_PROTO(const struct device *dev, void *tfd, size_t tfdlen,
                  void *buf0, size_t buf0_len,
                  void *buf1, size_t buf1_len),
-        TP_ARGS(priv, tfd, tfdlen, buf0, buf0_len, buf1, buf1_len),
+        TP_ARGS(dev, tfd, tfdlen, buf0, buf0_len, buf1, buf1_len),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
 
                 __field(size_t, framelen)
                 __dynamic_array(u8, tfd, tfdlen)
@@ -291,29 +295,28 @@ TRACE_EVENT(iwlwifi_dev_tx,
                 __dynamic_array(u8, buf1, buf1_len)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->framelen = buf0_len + buf1_len;
                 memcpy(__get_dynamic_array(tfd), tfd, tfdlen);
                 memcpy(__get_dynamic_array(buf0), buf0, buf0_len);
                 memcpy(__get_dynamic_array(buf1), buf1, buf1_len);
         ),
-        TP_printk("[%p] TX %.2x (%zu bytes)",
-                  __entry->priv,
-                  ((u8 *)__get_dynamic_array(buf0))[0],
+        TP_printk("[%s] TX %.2x (%zu bytes)",
+                  __get_str(dev), ((u8 *)__get_dynamic_array(buf0))[0],
                   __entry->framelen)
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_error,
-        TP_PROTO(void *priv, u32 desc, u32 tsf_low,
+        TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,
                  u32 data1, u32 data2, u32 line, u32 blink1,
                  u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
                  u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
                  u32 brd_ver),
-        TP_ARGS(priv, desc, tsf_low, data1, data2, line,
+        TP_ARGS(dev, desc, tsf_low, data1, data2, line,
                 blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
                 gp3, ucode_ver, hw_ver, brd_ver),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
                 __field(u32, desc)
                 __field(u32, tsf_low)
                 __field(u32, data1)
@@ -332,7 +335,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
                 __field(u32, brd_ver)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->desc = desc;
                 __entry->tsf_low = tsf_low;
                 __entry->data1 = data1;
@@ -350,11 +353,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
                 __entry->hw_ver = hw_ver;
                 __entry->brd_ver = brd_ver;
         ),
-        TP_printk("[%p] #%02d %010u data 0x%08X 0x%08X line %u, "
+        TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "
                   "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
                   "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "
                   "hw 0x%08X brd 0x%08X",
-                  __entry->priv, __entry->desc, __entry->tsf_low,
+                  __get_str(dev), __entry->desc, __entry->tsf_low,
                   __entry->data1,
                   __entry->data2, __entry->line, __entry->blink1,
                   __entry->blink2, __entry->ilink1, __entry->ilink2,
@@ -364,23 +367,23 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_event,
-        TP_PROTO(void *priv, u32 time, u32 data, u32 ev),
-        TP_ARGS(priv, time, data, ev),
+        TP_PROTO(const struct device *dev, u32 time, u32 data, u32 ev),
+        TP_ARGS(dev, time, data, ev),
         TP_STRUCT__entry(
-                PRIV_ENTRY
+                DEV_ENTRY
 
                 __field(u32, time)
                 __field(u32, data)
                 __field(u32, ev)
         ),
         TP_fast_assign(
-                PRIV_ASSIGN;
+                DEV_ASSIGN;
                 __entry->time = time;
                 __entry->data = data;
                 __entry->ev = ev;
         ),
-        TP_printk("[%p] EVT_LOGT:%010u:0x%08x:%04u",
-                  __entry->priv, __entry->time, __entry->data, __entry->ev)
+        TP_printk("[%s] EVT_LOGT:%010u:0x%08x:%04u",
+                  __get_str(dev), __entry->time, __entry->data, __entry->ev)
 );
 #endif /* __IWLWIFI_DEVICE_TRACE */