Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[linux-2.6-microblaze.git] / drivers / net / ethernet / hisilicon / hns3 / hns3pf / hclge_trace.h

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h
index 8510b88..f3cd5a3 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h
@@ -24,7 +24,7 @@ TRACE_EVENT(hclge_pf_mbx_get,
                __field(u8, code)
                __field(u8, subcode)
                __string(pciname, pci_name(hdev->pdev))
-               __string(devname, &hdev->vport[0].nic.kinfo.netdev->name)
+               __string(devname, hdev->vport[0].nic.kinfo.netdev->name)
                __array(u32, mbx_data, PF_GET_MBX_LEN)
        ),
 
@@ -33,7 +33,7 @@ TRACE_EVENT(hclge_pf_mbx_get,
                __entry->code = req->msg.code;
                __entry->subcode = req->msg.subcode;
                __assign_str(pciname, pci_name(hdev->pdev));
-               __assign_str(devname, &hdev->vport[0].nic.kinfo.netdev->name);
+               __assign_str(devname, hdev->vport[0].nic.kinfo.netdev->name);
                memcpy(__entry->mbx_data, req,
                       sizeof(struct hclge_mbx_vf_to_pf_cmd));
        ),
@@ -56,7 +56,7 @@ TRACE_EVENT(hclge_pf_mbx_send,
                __field(u8, vfid)
                __field(u16, code)
                __string(pciname, pci_name(hdev->pdev))
-               __string(devname, &hdev->vport[0].nic.kinfo.netdev->name)
+               __string(devname, hdev->vport[0].nic.kinfo.netdev->name)
                __array(u32, mbx_data, PF_SEND_MBX_LEN)
        ),
 
@@ -64,7 +64,7 @@ TRACE_EVENT(hclge_pf_mbx_send,
                __entry->vfid = req->dest_vfid;
                __entry->code = le16_to_cpu(req->msg.code);
                __assign_str(pciname, pci_name(hdev->pdev));
-               __assign_str(devname, &hdev->vport[0].nic.kinfo.netdev->name);
+               __assign_str(devname, hdev->vport[0].nic.kinfo.netdev->name);
                memcpy(__entry->mbx_data, req,
                       sizeof(struct hclge_mbx_pf_to_vf_cmd));
        ),