summaryrefslogtreecommitdiff
path: root/drivers/infiniband/core/cma_trace.h
diff options
context:
space:
mode:
authorMaxime Ripard <mripard@kernel.org>2024-05-27 12:08:31 +0300
committerMaxime Ripard <mripard@kernel.org>2024-05-27 12:08:31 +0300
commit375c4d1583948cf2439833e4a85d5a0aee853895 (patch)
tree821f494e7df09af36887f710cfce1fb89600e666 /drivers/infiniband/core/cma_trace.h
parent983095eaf6c161ef73d96152bfc1a99ca051cd57 (diff)
parent1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff)
downloadlinux-375c4d1583948cf2439833e4a85d5a0aee853895.tar.xz
Merge drm/drm-next into drm-misc-next
Let's start the new release cycle. Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/infiniband/core/cma_trace.h')
-rw-r--r--drivers/infiniband/core/cma_trace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/core/cma_trace.h b/drivers/infiniband/core/cma_trace.h
index 47f3c6e4be89..dc622f3778be 100644
--- a/drivers/infiniband/core/cma_trace.h
+++ b/drivers/infiniband/core/cma_trace.h
@@ -84,7 +84,7 @@ TRACE_EVENT(cm_id_attach,
sizeof(struct sockaddr_in6));
memcpy(__entry->dstaddr, &id_priv->id.route.addr.dst_addr,
sizeof(struct sockaddr_in6));
- __assign_str(devname, device->name);
+ __assign_str(devname);
),
TP_printk("cm.id=%u src=%pISpc dst=%pISpc device=%s",
@@ -334,7 +334,7 @@ DECLARE_EVENT_CLASS(cma_client_class,
),
TP_fast_assign(
- __assign_str(name, device->name);
+ __assign_str(name);
),
TP_printk("device name=%s",