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

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: Joe Perches <joe@perches.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

authored by

Joe Perches and committed by
Steven Rostedt (VMware) 78c14b38 bfbf8d15

+69 -69
+7 -7
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
··· 176 176 177 177 TP_fast_assign( 178 178 __entry->sched_job_id = job->base.id; 179 - __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) 179 + __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)); 180 180 __entry->context = job->base.s_fence->finished.context; 181 181 __entry->seqno = job->base.s_fence->finished.seqno; 182 - __assign_str(ring, to_amdgpu_ring(job->base.sched)->name) 182 + __assign_str(ring, to_amdgpu_ring(job->base.sched)->name); 183 183 __entry->num_ibs = job->num_ibs; 184 184 ), 185 185 TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u", ··· 201 201 202 202 TP_fast_assign( 203 203 __entry->sched_job_id = job->base.id; 204 - __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) 204 + __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)); 205 205 __entry->context = job->base.s_fence->finished.context; 206 206 __entry->seqno = job->base.s_fence->finished.seqno; 207 - __assign_str(ring, to_amdgpu_ring(job->base.sched)->name) 207 + __assign_str(ring, to_amdgpu_ring(job->base.sched)->name); 208 208 __entry->num_ibs = job->num_ibs; 209 209 ), 210 210 TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u", ··· 229 229 230 230 TP_fast_assign( 231 231 __entry->pasid = vm->pasid; 232 - __assign_str(ring, ring->name) 232 + __assign_str(ring, ring->name); 233 233 __entry->vmid = job->vmid; 234 234 __entry->vm_hub = ring->funcs->vmhub, 235 235 __entry->pd_addr = job->vm_pd_addr; ··· 424 424 ), 425 425 426 426 TP_fast_assign( 427 - __assign_str(ring, ring->name) 427 + __assign_str(ring, ring->name); 428 428 __entry->vmid = vmid; 429 429 __entry->vm_hub = ring->funcs->vmhub; 430 430 __entry->pd_addr = pd_addr; ··· 525 525 ), 526 526 527 527 TP_fast_assign( 528 - __assign_str(ring, sched_job->base.sched->name) 528 + __assign_str(ring, sched_job->base.sched->name); 529 529 __entry->id = sched_job->base.id; 530 530 __entry->fence = fence; 531 531 __entry->ctx = fence->context;
+1 -1
drivers/gpu/drm/lima/lima_trace.h
··· 24 24 __entry->task_id = task->base.id; 25 25 __entry->context = task->base.s_fence->finished.context; 26 26 __entry->seqno = task->base.s_fence->finished.seqno; 27 - __assign_str(pipe, task->base.sched->name) 27 + __assign_str(pipe, task->base.sched->name); 28 28 ), 29 29 30 30 TP_printk("task=%llu, context=%u seqno=%u pipe=%s",
+2 -2
drivers/infiniband/hw/hfi1/trace_misc.h
··· 63 63 __array(char, buf, 64) 64 64 __field(int, src) 65 65 ), 66 - TP_fast_assign(DD_DEV_ASSIGN(dd) 66 + TP_fast_assign(DD_DEV_ASSIGN(dd); 67 67 is_entry->is_name(__entry->buf, 64, 68 68 src - is_entry->start); 69 69 __entry->src = src; ··· 100 100 __field(u32, qpn) 101 101 __field(u8, opcode) 102 102 ), 103 - TP_fast_assign(DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 103 + TP_fast_assign(DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 104 104 __entry->qpn = qp->ibqp.qp_num; 105 105 __entry->opcode = opcode; 106 106 ),
+2 -2
drivers/infiniband/hw/hfi1/trace_rc.h
··· 70 70 __field(u32, r_psn) 71 71 ), 72 72 TP_fast_assign( 73 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 73 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 74 74 __entry->qpn = qp->ibqp.qp_num; 75 75 __entry->s_flags = qp->s_flags; 76 76 __entry->psn = psn; ··· 130 130 __field(u32, lpsn) 131 131 ), 132 132 TP_fast_assign(/* assign */ 133 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 133 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 134 134 __entry->qpn = qp->ibqp.qp_num; 135 135 __entry->aeth = aeth; 136 136 __entry->psn = psn;
+3 -3
drivers/infiniband/hw/hfi1/trace_tid.h
··· 886 886 __field(u8, s_retry) 887 887 ), 888 888 TP_fast_assign(/* assign */ 889 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 889 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 890 890 __entry->qpn = qp->ibqp.qp_num; 891 891 __entry->state = qp->state; 892 892 __entry->s_cur = qp->s_cur; ··· 1285 1285 __field(int, diff) 1286 1286 ), 1287 1287 TP_fast_assign(/* assign */ 1288 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 1288 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 1289 1289 __entry->qpn = qp->ibqp.qp_num; 1290 1290 __entry->s_flags = qp->s_flags; 1291 1291 __entry->state = qp->state; ··· 1574 1574 __field(u32, resync_psn) 1575 1575 ), 1576 1576 TP_fast_assign(/* assign */ 1577 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 1577 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 1578 1578 __entry->qpn = qp->ibqp.qp_num; 1579 1579 __entry->aeth = aeth; 1580 1580 __entry->psn = psn;
+4 -4
drivers/infiniband/hw/hfi1/trace_tx.h
··· 120 120 __field(unsigned long, iow_flags) 121 121 ), 122 122 TP_fast_assign( 123 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 123 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 124 124 __entry->flags = flags; 125 125 __entry->qpn = qp->ibqp.qp_num; 126 126 __entry->s_flags = qp->s_flags; ··· 868 868 __field(int, send_flags) 869 869 ), 870 870 TP_fast_assign( 871 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 871 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 872 872 __entry->wqe = wqe; 873 873 __entry->wr_id = wqe->wr.wr_id; 874 874 __entry->qpn = qp->ibqp.qp_num; ··· 904 904 __field(bool, flag) 905 905 ), 906 906 TP_fast_assign( 907 - DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)) 907 + DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device)); 908 908 __entry->qpn = qp->ibqp.qp_num; 909 909 __entry->flag = flag; 910 910 ), ··· 952 952 __field(u8, stopped) 953 953 ), 954 954 TP_fast_assign(/* assign */ 955 - DD_DEV_ASSIGN(txq->priv->dd) 955 + DD_DEV_ASSIGN(txq->priv->dd); 956 956 __entry->txq = txq; 957 957 __entry->sde = txq->sde; 958 958 __entry->head = txq->tx_ring.head;
+2 -2
drivers/infiniband/sw/rdmavt/trace_cq.h
··· 85 85 __field(int, comp_vector_cpu) 86 86 __field(u32, flags) 87 87 ), 88 - TP_fast_assign(RDI_DEV_ASSIGN(cq->rdi) 88 + TP_fast_assign(RDI_DEV_ASSIGN(cq->rdi); 89 89 __entry->ip = cq->ip; 90 90 __entry->cqe = attr->cqe; 91 91 __entry->comp_vector = attr->comp_vector; ··· 123 123 __field(u32, imm) 124 124 ), 125 125 TP_fast_assign( 126 - RDI_DEV_ASSIGN(cq->rdi) 126 + RDI_DEV_ASSIGN(cq->rdi); 127 127 __entry->wr_id = wc->wr_id; 128 128 __entry->status = wc->status; 129 129 __entry->opcode = wc->opcode;
+1 -1
drivers/infiniband/sw/rdmavt/trace_mr.h
··· 195 195 __field(uint, sg_offset) 196 196 ), 197 197 TP_fast_assign( 198 - RDI_DEV_ASSIGN(ib_to_rvt(to_imr(ibmr)->mr.pd->device)) 198 + RDI_DEV_ASSIGN(ib_to_rvt(to_imr(ibmr)->mr.pd->device)); 199 199 __entry->ibmr_iova = ibmr->iova; 200 200 __entry->iova = to_imr(ibmr)->mr.iova; 201 201 __entry->user_base = to_imr(ibmr)->mr.user_base;
+2 -2
drivers/infiniband/sw/rdmavt/trace_qp.h
··· 65 65 __field(u32, bucket) 66 66 ), 67 67 TP_fast_assign( 68 - RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)) 68 + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); 69 69 __entry->qpn = qp->ibqp.qp_num; 70 70 __entry->bucket = bucket; 71 71 ), ··· 97 97 __field(u32, to) 98 98 ), 99 99 TP_fast_assign( 100 - RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)) 100 + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); 101 101 __entry->qpn = qp->ibqp.qp_num; 102 102 __entry->hrtimer = &qp->s_rnr_timer; 103 103 __entry->s_flags = qp->s_flags;
+1 -1
drivers/infiniband/sw/rdmavt/trace_rc.h
··· 71 71 __field(u32, r_psn) 72 72 ), 73 73 TP_fast_assign( 74 - RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)) 74 + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); 75 75 __entry->qpn = qp->ibqp.qp_num; 76 76 __entry->s_flags = qp->s_flags; 77 77 __entry->psn = psn;
+2 -2
drivers/infiniband/sw/rdmavt/trace_tx.h
··· 111 111 __field(int, wr_num_sge) 112 112 ), 113 113 TP_fast_assign( 114 - RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)) 114 + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); 115 115 __entry->wqe = wqe; 116 116 __entry->wr_id = wqe->wr.wr_id; 117 117 __entry->qpn = qp->ibqp.qp_num; ··· 170 170 __field(int, send_flags) 171 171 ), 172 172 TP_fast_assign( 173 - RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)) 173 + RDI_DEV_ASSIGN(ib_to_rvt(qp->ibqp.device)); 174 174 __entry->wqe = wqe; 175 175 __entry->wr_id = wqe->wr.wr_id; 176 176 __entry->qpn = qp->ibqp.qp_num;
+3 -3
drivers/misc/mei/mei-trace.h
··· 26 26 __field(u32, val) 27 27 ), 28 28 TP_fast_assign( 29 - __assign_str(dev, dev_name(dev)) 29 + __assign_str(dev, dev_name(dev)); 30 30 __entry->reg = reg; 31 31 __entry->offs = offs; 32 32 __entry->val = val; ··· 45 45 __field(u32, val) 46 46 ), 47 47 TP_fast_assign( 48 - __assign_str(dev, dev_name(dev)) 48 + __assign_str(dev, dev_name(dev)); 49 49 __entry->reg = reg; 50 50 __entry->offs = offs; 51 51 __entry->val = val; ··· 64 64 __field(u32, val) 65 65 ), 66 66 TP_fast_assign( 67 - __assign_str(dev, dev_name(dev)) 67 + __assign_str(dev, dev_name(dev)); 68 68 __entry->reg = reg; 69 69 __entry->offs = offs; 70 70 __entry->val = val;
+6 -6
drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.h
··· 21 21 __field(u16, id) 22 22 __field(u64, size) 23 23 ), 24 - TP_fast_assign(__assign_str(dev, pci_name(pdev)) 24 + TP_fast_assign(__assign_str(dev, pci_name(pdev)); 25 25 __entry->id = id; 26 26 __entry->size = size; 27 27 ), ··· 36 36 __field(u16, num_msgs) 37 37 __field(u64, msg_size) 38 38 ), 39 - TP_fast_assign(__assign_str(dev, pci_name(pdev)) 39 + TP_fast_assign(__assign_str(dev, pci_name(pdev)); 40 40 __entry->num_msgs = num_msgs; 41 41 __entry->msg_size = msg_size; 42 42 ), ··· 52 52 __field(u16, rspid) 53 53 __field(int, rc) 54 54 ), 55 - TP_fast_assign(__assign_str(dev, pci_name(pdev)) 55 + TP_fast_assign(__assign_str(dev, pci_name(pdev)); 56 56 __entry->reqid = reqid; 57 57 __entry->rspid = rspid; 58 58 __entry->rc = rc; ··· 69 69 __string(str, msg) 70 70 __field(u64, intr) 71 71 ), 72 - TP_fast_assign(__assign_str(dev, pci_name(pdev)) 73 - __assign_str(str, msg) 72 + TP_fast_assign(__assign_str(dev, pci_name(pdev)); 73 + __assign_str(str, msg); 74 74 __entry->intr = intr; 75 75 ), 76 76 TP_printk("[%s] mbox interrupt %s (0x%llx)\n", __get_str(dev), ··· 84 84 __field(u16, id) 85 85 __field(int, err) 86 86 ), 87 - TP_fast_assign(__assign_str(dev, pci_name(pdev)) 87 + TP_fast_assign(__assign_str(dev, pci_name(pdev)); 88 88 __entry->id = id; 89 89 __entry->err = err; 90 90 ),
+2 -2
drivers/net/fjes/fjes_trace.h
··· 232 232 __string(err, err) 233 233 ), 234 234 TP_fast_assign( 235 - __assign_str(err, err) 235 + __assign_str(err, err); 236 236 ), 237 237 TP_printk("%s", __get_str(err)) 238 238 ); ··· 258 258 __string(err, err) 259 259 ), 260 260 TP_fast_assign( 261 - __assign_str(err, err) 261 + __assign_str(err, err); 262 262 ), 263 263 TP_printk("%s", __get_str(err)) 264 264 );
+1 -1
drivers/usb/cdns3/cdnsp-trace.h
··· 138 138 __string(text, msg) 139 139 ), 140 140 TP_fast_assign( 141 - __assign_str(text, msg) 141 + __assign_str(text, msg); 142 142 ), 143 143 TP_printk("%s", __get_str(text)) 144 144 );
+3 -3
fs/nfs/nfs4trace.h
··· 625 625 626 626 TP_fast_assign( 627 627 __entry->state = clp->cl_state; 628 - __assign_str(hostname, clp->cl_hostname) 628 + __assign_str(hostname, clp->cl_hostname); 629 629 ), 630 630 631 631 TP_printk( ··· 1637 1637 __entry->fileid = 0; 1638 1638 __entry->dev = 0; 1639 1639 } 1640 - __assign_str(dstaddr, clp ? clp->cl_hostname : "unknown") 1640 + __assign_str(dstaddr, clp ? clp->cl_hostname : "unknown"); 1641 1641 ), 1642 1642 1643 1643 TP_printk( ··· 1694 1694 __entry->fileid = 0; 1695 1695 __entry->dev = 0; 1696 1696 } 1697 - __assign_str(dstaddr, clp ? clp->cl_hostname : "unknown") 1697 + __assign_str(dstaddr, clp ? clp->cl_hostname : "unknown"); 1698 1698 __entry->stateid_seq = 1699 1699 be32_to_cpu(stateid->seqid); 1700 1700 __entry->stateid_hash =
+2 -2
fs/nfs/nfstrace.h
··· 1431 1431 __entry->version = task->tk_client->cl_vers; 1432 1432 __entry->error = error; 1433 1433 __assign_str(program, 1434 - task->tk_client->cl_program->name) 1435 - __assign_str(procedure, task->tk_msg.rpc_proc->p_name) 1434 + task->tk_client->cl_program->name); 1435 + __assign_str(procedure, task->tk_msg.rpc_proc->p_name); 1436 1436 ), 1437 1437 1438 1438 TP_printk(
+1 -1
include/trace/events/btrfs.h
··· 1097 1097 __entry->flags = flags; 1098 1098 __entry->bytes = bytes; 1099 1099 __entry->flush = flush; 1100 - __assign_str(reason, reason) 1100 + __assign_str(reason, reason); 1101 1101 ), 1102 1102 1103 1103 TP_printk_btrfs("%s: flush=%d(%s) flags=%llu(%s) bytes=%llu",
+2 -2
include/trace/events/dma_fence.h
··· 23 23 ), 24 24 25 25 TP_fast_assign( 26 - __assign_str(driver, fence->ops->get_driver_name(fence)) 27 - __assign_str(timeline, fence->ops->get_timeline_name(fence)) 26 + __assign_str(driver, fence->ops->get_driver_name(fence)); 27 + __assign_str(timeline, fence->ops->get_timeline_name(fence)); 28 28 __entry->context = fence->context; 29 29 __entry->seqno = fence->seqno; 30 30 ),
+2 -2
include/trace/events/rpcgss.h
··· 152 152 TP_fast_assign( 153 153 __entry->cred = gc; 154 154 __entry->service = gc->gc_service; 155 - __assign_str(principal, gc->gc_principal) 155 + __assign_str(principal, gc->gc_principal); 156 156 ), 157 157 158 158 TP_printk("cred=%p service=%s principal='%s'", ··· 535 535 ), 536 536 537 537 TP_fast_assign( 538 - __assign_str(msg, buf) 538 + __assign_str(msg, buf); 539 539 ), 540 540 541 541 TP_printk("msg='%s'", __get_str(msg))
+20 -20
include/trace/events/sunrpc.h
··· 154 154 __entry->client_id = clnt->cl_clid; 155 155 __assign_str(addr, xprt->address_strings[RPC_DISPLAY_ADDR]); 156 156 __assign_str(port, xprt->address_strings[RPC_DISPLAY_PORT]); 157 - __assign_str(program, program) 158 - __assign_str(server, server) 157 + __assign_str(program, program); 158 + __assign_str(server, server); 159 159 ), 160 160 161 161 TP_printk("client=%u peer=[%s]:%s program=%s server=%s", ··· 180 180 181 181 TP_fast_assign( 182 182 __entry->error = error; 183 - __assign_str(program, program) 184 - __assign_str(server, server) 183 + __assign_str(program, program); 184 + __assign_str(server, server); 185 185 ), 186 186 187 187 TP_printk("program=%s server=%s error=%d", ··· 284 284 __entry->client_id = task->tk_client->cl_clid; 285 285 __entry->version = task->tk_client->cl_vers; 286 286 __entry->async = RPC_IS_ASYNC(task); 287 - __assign_str(progname, task->tk_client->cl_program->name) 288 - __assign_str(procname, rpc_proc_name(task)) 287 + __assign_str(progname, task->tk_client->cl_program->name); 288 + __assign_str(procname, rpc_proc_name(task)); 289 289 ), 290 290 291 291 TP_printk("task:%u@%u %sv%d %s (%ssync)", ··· 494 494 __entry->task_id = task->tk_pid; 495 495 __entry->client_id = task->tk_client->cl_clid; 496 496 __entry->xid = be32_to_cpu(task->tk_rqstp->rq_xid); 497 - __assign_str(progname, task->tk_client->cl_program->name) 497 + __assign_str(progname, task->tk_client->cl_program->name); 498 498 __entry->version = task->tk_client->cl_vers; 499 - __assign_str(procname, rpc_proc_name(task)) 500 - __assign_str(servername, task->tk_xprt->servername) 499 + __assign_str(procname, rpc_proc_name(task)); 500 + __assign_str(servername, task->tk_xprt->servername); 501 501 ), 502 502 503 503 TP_printk("task:%u@%d server=%s xid=0x%08x %sv%d %s", ··· 622 622 __entry->task_id = task->tk_pid; 623 623 __entry->xid = be32_to_cpu(task->tk_rqstp->rq_xid); 624 624 __entry->version = task->tk_client->cl_vers; 625 - __assign_str(progname, task->tk_client->cl_program->name) 626 - __assign_str(procname, rpc_proc_name(task)) 625 + __assign_str(progname, task->tk_client->cl_program->name); 626 + __assign_str(procname, rpc_proc_name(task)); 627 627 __entry->backlog = ktime_to_us(backlog); 628 628 __entry->rtt = ktime_to_us(rtt); 629 629 __entry->execute = ktime_to_us(execute); ··· 669 669 __entry->task_id = task->tk_pid; 670 670 __entry->client_id = task->tk_client->cl_clid; 671 671 __assign_str(progname, 672 - task->tk_client->cl_program->name) 672 + task->tk_client->cl_program->name); 673 673 __entry->version = task->tk_client->cl_vers; 674 - __assign_str(procedure, task->tk_msg.rpc_proc->p_name) 674 + __assign_str(procedure, task->tk_msg.rpc_proc->p_name); 675 675 } else { 676 676 __entry->task_id = 0; 677 677 __entry->client_id = 0; 678 - __assign_str(progname, "unknown") 678 + __assign_str(progname, "unknown"); 679 679 __entry->version = 0; 680 - __assign_str(procedure, "unknown") 680 + __assign_str(procedure, "unknown"); 681 681 } 682 682 __entry->requested = requested; 683 683 __entry->end = xdr->end; ··· 735 735 __entry->task_id = task->tk_pid; 736 736 __entry->client_id = task->tk_client->cl_clid; 737 737 __assign_str(progname, 738 - task->tk_client->cl_program->name) 738 + task->tk_client->cl_program->name); 739 739 __entry->version = task->tk_client->cl_vers; 740 - __assign_str(procedure, task->tk_msg.rpc_proc->p_name) 740 + __assign_str(procedure, task->tk_msg.rpc_proc->p_name); 741 741 742 742 __entry->offset = offset; 743 743 __entry->copied = copied; ··· 1107 1107 __entry->xid = be32_to_cpu(rqst->rq_xid); 1108 1108 __entry->ntrans = rqst->rq_ntrans; 1109 1109 __assign_str(progname, 1110 - task->tk_client->cl_program->name) 1110 + task->tk_client->cl_program->name); 1111 1111 __entry->version = task->tk_client->cl_vers; 1112 - __assign_str(procedure, task->tk_msg.rpc_proc->p_name) 1112 + __assign_str(procedure, task->tk_msg.rpc_proc->p_name); 1113 1113 ), 1114 1114 1115 1115 TP_printk( ··· 1842 1842 1843 1843 TP_fast_assign( 1844 1844 __assign_str(addr, xprt->xpt_remotebuf); 1845 - __assign_str(protocol, xprt->xpt_class->xcl_name) 1845 + __assign_str(protocol, xprt->xpt_class->xcl_name); 1846 1846 __assign_str(service, service); 1847 1847 ), 1848 1848