1*92b7734cSMichal BergerSee: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2c92ca849f 2*92b7734cSMichal Berger--- 3*92b7734cSMichal Berger src/ice_trace.h | 19 +++++++++---------- 4*92b7734cSMichal Berger 1 file changed, 9 insertions(+), 10 deletions(-) 5*92b7734cSMichal Berger 6*92b7734cSMichal Bergerdiff --git a/src/ice_trace.h b/src/ice_trace.h 7*92b7734cSMichal Bergerindex 839647a..fe3d414 100644 8*92b7734cSMichal Berger--- a/src/ice_trace.h 9*92b7734cSMichal Berger+++ b/src/ice_trace.h 10*92b7734cSMichal Berger@@ -88,7 +88,7 @@ DECLARE_EVENT_CLASS(ice_print_msg, 11*92b7734cSMichal Berger 12*92b7734cSMichal Berger TP_STRUCT__entry(__string(msg, msg)), 13*92b7734cSMichal Berger 14*92b7734cSMichal Berger- TP_fast_assign(__assign_str(msg, msg);), 15*92b7734cSMichal Berger+ TP_fast_assign(__assign_str(msg);), 16*92b7734cSMichal Berger 17*92b7734cSMichal Berger TP_printk("%s", __get_str(msg)) 18*92b7734cSMichal Berger ); 19*92b7734cSMichal Berger@@ -117,7 +117,7 @@ DECLARE_EVENT_CLASS(ice_rx_dim_template, 20*92b7734cSMichal Berger 21*92b7734cSMichal Berger TP_fast_assign(__entry->q_vector = q_vector; 22*92b7734cSMichal Berger __entry->dim = dim; 23*92b7734cSMichal Berger- __assign_str(devname, q_vector->rx.rx_ring->netdev->name);), 24*92b7734cSMichal Berger+ __assign_str(devname);), 25*92b7734cSMichal Berger 26*92b7734cSMichal Berger TP_printk("netdev: %s Rx-Q: %d dim-state: %d dim-profile: %d dim-tune: %d dim-st-right: %d dim-st-left: %d dim-tired: %d", 27*92b7734cSMichal Berger __get_str(devname), 28*92b7734cSMichal Berger@@ -144,7 +144,7 @@ DECLARE_EVENT_CLASS(ice_tx_dim_template, 29*92b7734cSMichal Berger 30*92b7734cSMichal Berger TP_fast_assign(__entry->q_vector = q_vector; 31*92b7734cSMichal Berger __entry->dim = dim; 32*92b7734cSMichal Berger- __assign_str(devname, q_vector->tx.tx_ring->netdev->name);), 33*92b7734cSMichal Berger+ __assign_str(devname);), 34*92b7734cSMichal Berger 35*92b7734cSMichal Berger TP_printk("netdev: %s Tx-Q: %d dim-state: %d dim-profile: %d dim-tune: %d dim-st-right: %d dim-st-left: %d dim-tired: %d", 36*92b7734cSMichal Berger __get_str(devname), 37*92b7734cSMichal Berger@@ -176,7 +176,7 @@ DECLARE_EVENT_CLASS(ice_tx_template, 38*92b7734cSMichal Berger TP_fast_assign(__entry->ring = ring; 39*92b7734cSMichal Berger __entry->desc = desc; 40*92b7734cSMichal Berger __entry->buf = buf; 41*92b7734cSMichal Berger- __assign_str(devname, ring->netdev->name);), 42*92b7734cSMichal Berger+ __assign_str(devname);), 43*92b7734cSMichal Berger 44*92b7734cSMichal Berger TP_printk("netdev: %s ring: %p desc: %p buf %p", __get_str(devname), 45*92b7734cSMichal Berger __entry->ring, __entry->desc, __entry->buf) 46*92b7734cSMichal Berger@@ -204,7 +204,7 @@ DECLARE_EVENT_CLASS(ice_rx_template, 47*92b7734cSMichal Berger 48*92b7734cSMichal Berger TP_fast_assign(__entry->ring = ring; 49*92b7734cSMichal Berger __entry->desc = desc; 50*92b7734cSMichal Berger- __assign_str(devname, ring->netdev->name);), 51*92b7734cSMichal Berger+ __assign_str(devname);), 52*92b7734cSMichal Berger 53*92b7734cSMichal Berger TP_printk("netdev: %s ring: %p desc: %p", __get_str(devname), 54*92b7734cSMichal Berger __entry->ring, __entry->desc) 55*92b7734cSMichal Berger@@ -228,7 +228,7 @@ DECLARE_EVENT_CLASS(ice_rx_indicate_template, 56*92b7734cSMichal Berger TP_fast_assign(__entry->ring = ring; 57*92b7734cSMichal Berger __entry->desc = desc; 58*92b7734cSMichal Berger __entry->skb = skb; 59*92b7734cSMichal Berger- __assign_str(devname, ring->netdev->name);), 60*92b7734cSMichal Berger+ __assign_str(devname);), 61*92b7734cSMichal Berger 62*92b7734cSMichal Berger TP_printk("netdev: %s ring: %p desc: %p skb %p", __get_str(devname), 63*92b7734cSMichal Berger __entry->ring, __entry->desc, __entry->skb) 64*92b7734cSMichal Berger@@ -251,7 +251,7 @@ DECLARE_EVENT_CLASS(ice_xmit_template, 65*92b7734cSMichal Berger 66*92b7734cSMichal Berger TP_fast_assign(__entry->ring = ring; 67*92b7734cSMichal Berger __entry->skb = skb; 68*92b7734cSMichal Berger- __assign_str(devname, ring->netdev->name);), 69*92b7734cSMichal Berger+ __assign_str(devname);), 70*92b7734cSMichal Berger 71*92b7734cSMichal Berger TP_printk("netdev: %s skb: %p ring: %p", __get_str(devname), 72*92b7734cSMichal Berger __entry->skb, __entry->ring) 73*92b7734cSMichal Berger@@ -285,9 +285,8 @@ DECLARE_EVENT_CLASS(ice_tx_tstamp_template, 74*92b7734cSMichal Berger __field(u8, calibrating)), 75*92b7734cSMichal Berger 76*92b7734cSMichal Berger TP_fast_assign(lockdep_assert_held(&tx->lock); 77*92b7734cSMichal Berger- __assign_str(dev_name, dev_name(dev)); 78*92b7734cSMichal Berger- __assign_str(netdev_name, 79*92b7734cSMichal Berger- netdev_name(skb->dev)); 80*92b7734cSMichal Berger+ __assign_str(dev_name); 81*92b7734cSMichal Berger+ __assign_str(netdev_name); 82*92b7734cSMichal Berger __entry->skb = skb; 83*92b7734cSMichal Berger __entry->seq = ice_ptp_get_seq_id(skb); 84*92b7734cSMichal Berger __entry->idx = idx; 85*92b7734cSMichal Berger-- 86*92b7734cSMichal Berger 87