Commit 78c14b38 authored by Joe Perches's avatar Joe Perches Committed by Steven Rostedt (VMware)
Browse files

treewide: Add missing semicolons to __assign_str uses 

The __assign_str macro has an unusual ending semicolon but the vast
majority of uses of the macro already have semicolon termination.

$ git grep -P '\b__assign_str\b' | wc -l
551
$ git grep -P '\b__assign_str\b.*;' | wc -l
480

Add semicolons to the __assign_str() uses without semicolon termination
and all the other uses without semicolon termination via additional defines
that are equivalent to __assign_str() with the eventual goal of removing
the semicolon from the __assign_str() macro definition.

Link: https://lore.kernel.org/lkml/1e068d21106bb6db05b735b4916bb420e6c9842a.camel@perches.com/
Link: https://lkml.kernel.org/r/48a056adabd8f70444475352f617914cef504a45.camel@perches.com



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent bfbf8d15

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h

+7 −7
Original line number Diff line number Diff line
@@ -176,10 +176,10 @@ TRACE_EVENT(amdgpu_cs_ioctl, 


	    TP_fast_assign(

			   __entry->sched_job_id = job->base.id;

			   __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))

			   __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job));

			   __entry->context = job->base.s_fence->finished.context;

			   __entry->seqno = job->base.s_fence->finished.seqno;

			   __assign_str(ring, to_amdgpu_ring(job->base.sched)->name)

			   __assign_str(ring, to_amdgpu_ring(job->base.sched)->name);

			   __entry->num_ibs = job->num_ibs;

			   ),

	    TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
@@ -201,10 +201,10 @@ TRACE_EVENT(amdgpu_sched_run_job, 


	    TP_fast_assign(

			   __entry->sched_job_id = job->base.id;

			   __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))

			   __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job));

			   __entry->context = job->base.s_fence->finished.context;

			   __entry->seqno = job->base.s_fence->finished.seqno;

			   __assign_str(ring, to_amdgpu_ring(job->base.sched)->name)

			   __assign_str(ring, to_amdgpu_ring(job->base.sched)->name);

			   __entry->num_ibs = job->num_ibs;

			   ),

	    TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
@@ -229,7 +229,7 @@ TRACE_EVENT(amdgpu_vm_grab_id, 


	    TP_fast_assign(

			   __entry->pasid = vm->pasid;

			   __assign_str(ring, ring->name)

			   __assign_str(ring, ring->name);

			   __entry->vmid = job->vmid;

			   __entry->vm_hub = ring->funcs->vmhub,

			   __entry->pd_addr = job->vm_pd_addr;
@@ -424,7 +424,7 @@ TRACE_EVENT(amdgpu_vm_flush, 
			     ),



	    TP_fast_assign(

			   __assign_str(ring, ring->name)

			   __assign_str(ring, ring->name);

			   __entry->vmid = vmid;

			   __entry->vm_hub = ring->funcs->vmhub;

			   __entry->pd_addr = pd_addr;
@@ -525,7 +525,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, 
			     ),



	    TP_fast_assign(

			   __assign_str(ring, sched_job->base.sched->name)

			   __assign_str(ring, sched_job->base.sched->name);

			   __entry->id = sched_job->base.id;

			   __entry->fence = fence;

			   __entry->ctx = fence->context;

drivers/gpu/drm/lima/lima_trace.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ DECLARE_EVENT_CLASS(lima_task, 
		__entry->task_id = task->base.id;

		__entry->context = task->base.s_fence->finished.context;

		__entry->seqno = task->base.s_fence->finished.seqno;

		__assign_str(pipe, task->base.sched->name)

		__assign_str(pipe, task->base.sched->name);

		),



	TP_printk("task=%llu, context=%u seqno=%u pipe=%s",

drivers/infiniband/hw/hfi1/trace_misc.h

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ TRACE_EVENT(hfi1_interrupt, 
			     __array(char, buf, 64)

			     __field(int, src)

			     ),

	    TP_fast_assign(DD_DEV_ASSIGN(dd)

	    TP_fast_assign(DD_DEV_ASSIGN(dd);

			   is_entry->is_name(__entry->buf, 64,

					     src - is_entry->start);

			   __entry->src = src;
@@ -100,7 +100,7 @@ TRACE_EVENT(hfi1_fault_opcode, 
			     __field(u32, qpn)

			     __field(u8, opcode)

			     ),

	    TP_fast_assign(DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device))

	    TP_fast_assign(DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

			   __entry->qpn = qp->ibqp.qp_num;

			   __entry->opcode = opcode;

			   ),

drivers/infiniband/hw/hfi1/trace_rc.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ DECLARE_EVENT_CLASS(hfi1_rc_template, 
			__field(u32, r_psn)

			),

		    TP_fast_assign(

			DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device))

			DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

			__entry->qpn = qp->ibqp.qp_num;

			__entry->s_flags = qp->s_flags;

			__entry->psn = psn;
@@ -130,7 +130,7 @@ DECLARE_EVENT_CLASS(/* rc_ack */ 
		__field(u32, lpsn)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device))

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->aeth = aeth;

		__entry->psn = psn;

drivers/infiniband/hw/hfi1/trace_tid.h

+3 −3
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ DECLARE_EVENT_CLASS(/* sender_info */ 
		__field(u8, s_retry)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device))

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->state = qp->state;

		__entry->s_cur = qp->s_cur;
@@ -1285,7 +1285,7 @@ DECLARE_EVENT_CLASS(/* rc_rcv_err */ 
		__field(int, diff)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device))

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->s_flags = qp->s_flags;

		__entry->state = qp->state;
@@ -1574,7 +1574,7 @@ DECLARE_EVENT_CLASS(/* tid_ack */ 
		__field(u32, resync_psn)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device))

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->aeth = aeth;

		__entry->psn = psn;