2014-11-27 07:54:29

by Michal Kazior

Subject: [PATCH] ath10k: add pointer constness to traces

Traces shouldn't modified passed data. This will
make it possible to pass const arguments to
traces.

Signed-off-by: Michal Kazior <[email protected]>
---
drivers/net/wireless/ath/ath10k/trace.h | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/trace.h b/drivers/net/wireless/ath/ath10k/trace.h
index ceea566..b289378 100644
--- a/drivers/net/wireless/ath/ath10k/trace.h
+++ b/drivers/net/wireless/ath/ath10k/trace.h
@@ -21,9 +21,11 @@
#include "core.h"

#if !defined(_TRACE_H_)
-static inline u32 ath10k_frm_hdr_len(void *buf)
+static inline u32 ath10k_frm_hdr_len(const void *buf)
{
- return ieee80211_hdrlen(((struct ieee80211_hdr *)buf)->frame_control);
+ const struct ieee80211_hdr *hdr = buf;
+
+ return ieee80211_hdrlen(hdr->frame_control);
}
#endif

@@ -145,7 +147,8 @@ TRACE_EVENT(ath10k_log_dbg_dump,
);

TRACE_EVENT(ath10k_wmi_cmd,
- TP_PROTO(struct ath10k *ar, int id, void *buf, size_t buf_len, int ret),
+ TP_PROTO(struct ath10k *ar, int id, const void *buf, size_t buf_len,
+ int ret),

TP_ARGS(ar, id, buf, buf_len, ret),

@@ -178,7 +181,7 @@ TRACE_EVENT(ath10k_wmi_cmd,
);

TRACE_EVENT(ath10k_wmi_event,
- TP_PROTO(struct ath10k *ar, int id, void *buf, size_t buf_len),
+ TP_PROTO(struct ath10k *ar, int id, const void *buf, size_t buf_len),

TP_ARGS(ar, id, buf, buf_len),

@@ -208,7 +211,7 @@ TRACE_EVENT(ath10k_wmi_event,
);

TRACE_EVENT(ath10k_htt_stats,
- TP_PROTO(struct ath10k *ar, void *buf, size_t buf_len),
+ TP_PROTO(struct ath10k *ar, const void *buf, size_t buf_len),

TP_ARGS(ar, buf, buf_len),

@@ -235,7 +238,7 @@ TRACE_EVENT(ath10k_htt_stats,
);

TRACE_EVENT(ath10k_wmi_dbglog,
- TP_PROTO(struct ath10k *ar, void *buf, size_t buf_len),
+ TP_PROTO(struct ath10k *ar, const void *buf, size_t buf_len),

TP_ARGS(ar, buf, buf_len),

@@ -262,7 +265,7 @@ TRACE_EVENT(ath10k_wmi_dbglog,
);

TRACE_EVENT(ath10k_htt_pktlog,
- TP_PROTO(struct ath10k *ar, void *buf, u16 buf_len),
+ TP_PROTO(struct ath10k *ar, const void *buf, u16 buf_len),

TP_ARGS(ar, buf, buf_len),

@@ -349,7 +352,7 @@ TRACE_EVENT(ath10k_txrx_tx_unref,
);

DECLARE_EVENT_CLASS(ath10k_hdr_event,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),

TP_ARGS(ar, data, len),

@@ -376,7 +379,7 @@ DECLARE_EVENT_CLASS(ath10k_hdr_event,
);

DECLARE_EVENT_CLASS(ath10k_payload_event,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),

TP_ARGS(ar, data, len),

@@ -404,27 +407,27 @@ DECLARE_EVENT_CLASS(ath10k_payload_event,
);

DEFINE_EVENT(ath10k_hdr_event, ath10k_tx_hdr,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),
TP_ARGS(ar, data, len)
);

DEFINE_EVENT(ath10k_payload_event, ath10k_tx_payload,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),
TP_ARGS(ar, data, len)
);

DEFINE_EVENT(ath10k_hdr_event, ath10k_rx_hdr,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),
TP_ARGS(ar, data, len)
);

DEFINE_EVENT(ath10k_payload_event, ath10k_rx_payload,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),
TP_ARGS(ar, data, len)
);

TRACE_EVENT(ath10k_htt_rx_desc,
- TP_PROTO(struct ath10k *ar, void *data, size_t len),
+ TP_PROTO(struct ath10k *ar, const void *data, size_t len),

TP_ARGS(ar, data, len),

--
1.8.5.3

2014-12-01 07:06:50

by Kalle Valo

Subject: Re: [PATCH] ath10k: add pointer constness to traces

Michal Kazior <[email protected]> writes:

> Traces shouldn't modified passed data. This will
> make it possible to pass const arguments to
> traces.
>
> Signed-off-by: Michal Kazior <[email protected]>

Thanks, applied.

--
Kalle Valo