tracing/treewide: Remove second parameter of __assign_str()
With the rework of how the __string() handles dynamic strings where it saves off the source string in field in the helper structure[1], the assignment of that value to the trace event field is stored in the helper value and does not need to be passed in again. This means that with: __string(field, mystring) Which use to be assigned with __assign_str(field, mystring), no longer needs the second parameter and it is unused. With this, __assign_str() will now only get a single parameter. There's over 700 users of __assign_str() and because coccinelle does not handle the TRACE_EVENT() macro I ended up using the following sed script: git grep -l __assign_str | while read a ; do sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file; mv /tmp/test-file $a; done I then searched for __assign_str() that did not end with ';' as those were multi line assignments that the sed script above would fail to catch. Note, the same updates will need to be done for: __assign_str_len() __assign_rel_str() __assign_rel_str_len() I tested this with both an allmodconfig and an allyesconfig (build only for both). [1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/ Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Julia Lawall <Julia.Lawall@inria.fr> Signed-off-by:Steven Rostedt (Google) <rostedt@goodmis.org> Acked-by:
Jani Nikula <jani.nikula@intel.com> Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts. Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal Acked-by:
Takashi Iwai <tiwai@suse.de> Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs Tested-by:
Guenter Roeck <linux@roeck-us.net>
Showing
- arch/arm64/kernel/trace-events-emulation.h 1 addition, 1 deletionarch/arm64/kernel/trace-events-emulation.h
- arch/powerpc/include/asm/trace.h 2 additions, 2 deletionsarch/powerpc/include/asm/trace.h
- arch/x86/kvm/trace.h 1 addition, 1 deletionarch/x86/kvm/trace.h
- drivers/base/regmap/trace.h 9 additions, 9 deletionsdrivers/base/regmap/trace.h
- drivers/base/trace.h 1 addition, 1 deletiondrivers/base/trace.h
- drivers/block/rnbd/rnbd-srv-trace.h 6 additions, 6 deletionsdrivers/block/rnbd/rnbd-srv-trace.h
- drivers/bus/mhi/host/trace.h 6 additions, 6 deletionsdrivers/bus/mhi/host/trace.h
- drivers/cxl/core/trace.h 16 additions, 16 deletionsdrivers/cxl/core/trace.h
- drivers/dma-buf/sync_trace.h 1 addition, 1 deletiondrivers/dma-buf/sync_trace.h
- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h 8 additions, 8 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h 1 addition, 1 deletiondrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h
- drivers/gpu/drm/i915/display/intel_display_trace.h 28 additions, 28 deletionsdrivers/gpu/drm/i915/display/intel_display_trace.h
- drivers/gpu/drm/lima/lima_trace.h 1 addition, 1 deletiondrivers/gpu/drm/lima/lima_trace.h
- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h 6 additions, 6 deletionsdrivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h 2 additions, 2 deletionsdrivers/gpu/drm/scheduler/gpu_scheduler_trace.h
- drivers/gpu/drm/virtio/virtgpu_trace.h 1 addition, 1 deletiondrivers/gpu/drm/virtio/virtgpu_trace.h
- drivers/infiniband/core/cma_trace.h 2 additions, 2 deletionsdrivers/infiniband/core/cma_trace.h
- drivers/infiniband/hw/hfi1/hfi.h 1 addition, 1 deletiondrivers/infiniband/hw/hfi1/hfi.h
- drivers/infiniband/hw/hfi1/trace_dbg.h 1 addition, 1 deletiondrivers/infiniband/hw/hfi1/trace_dbg.h
- drivers/infiniband/hw/hfi1/trace_rx.h 1 addition, 1 deletiondrivers/infiniband/hw/hfi1/trace_rx.h
Loading
Please register or sign in to comment