Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b988a887 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath5k: remove PRIV_ENTRY and PRIV_ASSIGN macros, they obfuscate the code 



Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 69f7235f

drivers/net/wireless/ath/ath5k/trace.h

+6 −9
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ static inline void trace_ ## name(proto) {} 


struct sk_buff;



#define PRIV_ENTRY  __field(struct ath5k_softc *, priv)

#define PRIV_ASSIGN __entry->priv = priv



#undef TRACE_SYSTEM

#define TRACE_SYSTEM ath5k
@@ -22,12 +19,12 @@ TRACE_EVENT(ath5k_rx, 
	TP_PROTO(struct ath5k_softc *priv, struct sk_buff *skb),

	TP_ARGS(priv, skb),

	TP_STRUCT__entry(

		PRIV_ENTRY

		__field(struct ath5k_softc *, priv)

		__field(unsigned long, skbaddr)

		__dynamic_array(u8, frame, skb->len)

	),

	TP_fast_assign(

		PRIV_ASSIGN;

		__entry->priv = priv;

		__entry->skbaddr = (unsigned long) skb;

		memcpy(__get_dynamic_array(frame), skb->data, skb->len);

	),
@@ -43,14 +40,14 @@ TRACE_EVENT(ath5k_tx, 
	TP_ARGS(priv, skb, q),



	TP_STRUCT__entry(

		PRIV_ENTRY

		__field(struct ath5k_softc *, priv)

		__field(unsigned long, skbaddr)

		__field(u8, qnum)

		__dynamic_array(u8, frame, skb->len)

	),



	TP_fast_assign(

		PRIV_ASSIGN;

		__entry->priv = priv;

		__entry->skbaddr = (unsigned long) skb;

		__entry->qnum = (u8) q->qnum;

		memcpy(__get_dynamic_array(frame), skb->data, skb->len);
@@ -69,7 +66,7 @@ TRACE_EVENT(ath5k_tx_complete, 
	TP_ARGS(priv, skb, q, ts),



	TP_STRUCT__entry(

		PRIV_ENTRY

		__field(struct ath5k_softc *, priv)

		__field(unsigned long, skbaddr)

		__field(u8, qnum)

		__field(u8, ts_status)
@@ -78,7 +75,7 @@ TRACE_EVENT(ath5k_tx_complete, 
	),



	TP_fast_assign(

		PRIV_ASSIGN;

		__entry->priv = priv;

		__entry->skbaddr = (unsigned long) skb;

		__entry->qnum = (u8) q->qnum;

		__entry->ts_status = ts->ts_status;