Changeset 772 for GPL/trunk/alsa-kernel/hda/trace.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/trace.h (modified) (3 diffs)

GPL/trunk/alsa-kernel/hda/trace.h

@@ -20 +20 @@
         TP_PROTO(struct hdac_bus *bus, unsigned int cmd),
         TP_ARGS(bus, cmd),
-        TP_STRUCT__entry(__dynamic_array(char, msg, HDAC_MSG_MAX)),
+        TP_STRUCT__entry(
+                __string(name, dev_name((bus)->dev))
+                __field(u32, cmd)
+        ),
         TP_fast_assign(
-                snprintf(__get_str(msg), HDAC_MSG_MAX,
-                         "[%s:%d] val=0x%08x",
-                         dev_name((bus)->dev), (cmd) >> 28, cmd);
+                __assign_str(name, dev_name((bus)->dev));
+                __entry->cmd = cmd;
         ),
-        TP_printk("%s", __get_str(msg))
+        TP_printk("[%s:%d] val=0x%08x", __get_str(name), __entry->cmd >> 28, __entry->cmd)
 );
 
@@ -32 +34 @@
         TP_PROTO(struct hdac_bus *bus, unsigned int addr, unsigned int res),
         TP_ARGS(bus, addr, res),
-        TP_STRUCT__entry(__dynamic_array(char, msg, HDAC_MSG_MAX)),
+        TP_STRUCT__entry(
+                __string(name, dev_name((bus)->dev))
+                __field(u32, addr)
+                __field(u32, res)
+        ),
         TP_fast_assign(
-                snprintf(__get_str(msg), HDAC_MSG_MAX,
-                         "[%s:%d] val=0x%08x",
-                         dev_name((bus)->dev), addr, res);
+                __assign_str(name, dev_name((bus)->dev));
+                __entry->addr = addr;
+                __entry->res = res;
         ),
-        TP_printk("%s", __get_str(msg))
+        TP_printk("[%s:%d] val=0x%08x", __get_str(name), __entry->addr, __entry->res)
 );
 
@@ -44 +50 @@
         TP_PROTO(struct hdac_bus *bus, u32 res, u32 res_ex),
         TP_ARGS(bus, res, res_ex),
-        TP_STRUCT__entry(__dynamic_array(char, msg, HDAC_MSG_MAX)),
+        TP_STRUCT__entry(
+                __string(name, dev_name((bus)->dev))
+                __field(u32, res)
+                __field(u32, res_ex)
+        ),
         TP_fast_assign(
-                snprintf(__get_str(msg), HDAC_MSG_MAX,
-                         "[%s:%d] res=0x%08x, res_ex=0x%08x",
-                         dev_name((bus)->dev), res_ex & 0x0f, res, res_ex);
+                __assign_str(name, dev_name((bus)->dev));
+                __entry->res = res;
+                __entry->res_ex = res_ex;
         ),
-        TP_printk("%s", __get_str(msg))
+        TP_printk("[%s:%d] res=0x%08x, res_ex=0x%08x", __get_str(name),
+                  __entry->res_ex & 0x0f, __entry->res, __entry->res_ex)
 );