Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Add missing ; to __assign_str() macros in tracepoint code

I'm working on improving the __assign_str() and __string() macros to be
more efficient, and removed some unneeded semicolons. This triggered a bug
in the build as some of the __assign_str() macros in intel_display_trace
was missing a terminating semicolon.

Link: https://lore.kernel.org/linux-trace-kernel/20240222133057.2af72a19@gandalf.local.home

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@gmail.com>
Cc: stable@vger.kernel.org
Fixes: 2ceea5d88048b ("drm/i915: Print plane name in fbc tracepoints")
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

+3 -3
+3 -3
drivers/gpu/drm/i915/display/intel_display_trace.h
··· 411 411 struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev), 412 412 plane->pipe); 413 413 __assign_str(dev, __dev_name_kms(plane)); 414 - __assign_str(name, plane->base.name) 414 + __assign_str(name, plane->base.name); 415 415 __entry->pipe = crtc->pipe; 416 416 __entry->frame = intel_crtc_get_vblank_counter(crtc); 417 417 __entry->scanline = intel_get_crtc_scanline(crtc); ··· 438 438 struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev), 439 439 plane->pipe); 440 440 __assign_str(dev, __dev_name_kms(plane)); 441 - __assign_str(name, plane->base.name) 441 + __assign_str(name, plane->base.name); 442 442 __entry->pipe = crtc->pipe; 443 443 __entry->frame = intel_crtc_get_vblank_counter(crtc); 444 444 __entry->scanline = intel_get_crtc_scanline(crtc); ··· 465 465 struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev), 466 466 plane->pipe); 467 467 __assign_str(dev, __dev_name_kms(plane)); 468 - __assign_str(name, plane->base.name) 468 + __assign_str(name, plane->base.name); 469 469 __entry->pipe = crtc->pipe; 470 470 __entry->frame = intel_crtc_get_vblank_counter(crtc); 471 471 __entry->scanline = intel_get_crtc_scanline(crtc);