Remove the local BOOL_TO_STR macro and replace all its usages with the kernel's str_true_false() helper from . No functional change intended. Signed-off-by: Serhat Kumral --- net/wireless/trace.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 94944f2a39a4..befab459852a 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -14,6 +14,7 @@ #include #include +#include #include #include "core.h" @@ -228,7 +229,6 @@ __entry->plink_state = sinfo->plink_state; \ } while (0) -#define BOOL_TO_STR(bo) (bo) ? "true" : "false" #define QOS_MAP_ENTRY __field(u8, num_des) \ __array(u8, dscp_exception, \ @@ -578,7 +578,7 @@ DECLARE_EVENT_CLASS(key_handle, TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", link_id: %d, " "key_index: %u, pairwise: %s, mac addr: %pM", WIPHY_PR_ARG, WDEV_PR_ARG, __entry->link_id, - __entry->key_index, BOOL_TO_STR(__entry->pairwise), + __entry->key_index, str_true_false(__entry->pairwise), __entry->mac_addr) ); @@ -621,7 +621,7 @@ TRACE_EVENT(rdev_add_key, "mac addr: %pM", WIPHY_PR_ARG, WDEV_PR_ARG, __entry->link_id, __entry->key_index, __entry->mode, - BOOL_TO_STR(__entry->pairwise), __entry->mac_addr) + str_true_false(__entry->pairwise), __entry->mac_addr) ); TRACE_EVENT(rdev_set_default_key, @@ -647,8 +647,8 @@ TRACE_EVENT(rdev_set_default_key, TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", link_id: %d, " "key index: %u, unicast: %s, multicast: %s", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->link_id, - __entry->key_index, BOOL_TO_STR(__entry->unicast), - BOOL_TO_STR(__entry->multicast)) + __entry->key_index, str_true_false(__entry->unicast), + str_true_false(__entry->multicast)) ); TRACE_EVENT(rdev_set_default_mgmt_key, @@ -733,7 +733,7 @@ TRACE_EVENT(rdev_start_ap, WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->ssid, CHAN_DEF_PR_ARG, __entry->beacon_interval, __entry->dtim_period, __entry->hidden_ssid, __entry->wpa_ver, - BOOL_TO_STR(__entry->privacy), __entry->auth_type, + str_true_false(__entry->privacy), __entry->auth_type, __entry->inactivity_timeout, __entry->link_id) ); @@ -1469,7 +1469,7 @@ TRACE_EVENT(rdev_assoc, TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: %pM" ", previous bssid: %pM, use mfp: %s, flags: 0x%x", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->bssid, - __entry->prev_bssid, BOOL_TO_STR(__entry->use_mfp), + __entry->prev_bssid, str_true_false(__entry->use_mfp), __entry->flags) ); @@ -1518,7 +1518,7 @@ TRACE_EVENT(rdev_disassoc, ", reason: %u, local state change: %s", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->bssid, __entry->reason_code, - BOOL_TO_STR(__entry->local_state_change)) + str_true_false(__entry->local_state_change)) ); TRACE_EVENT(rdev_mgmt_tx_cancel_wait, @@ -1591,7 +1591,7 @@ TRACE_EVENT(rdev_connect, ", ssid: %s, auth type: %d, privacy: %s, wpa versions: %u, " "flags: 0x%x, previous bssid: %pM", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->bssid, __entry->ssid, - __entry->auth_type, BOOL_TO_STR(__entry->privacy), + __entry->auth_type, str_true_false(__entry->privacy), __entry->wpa_versions, __entry->flags, __entry->prev_bssid) ); @@ -2033,7 +2033,7 @@ TRACE_EVENT(rdev_tdls_mgmt, WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->peer, __entry->link_id, __entry->action_code, __entry->dialog_token, __entry->status_code, __entry->peer_capability, - BOOL_TO_STR(__entry->initiator), + str_true_false(__entry->initiator), ((u8 *)__get_dynamic_array(buf))[0]) ); @@ -2246,9 +2246,9 @@ TRACE_EVENT(rdev_mgmt_tx, TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", " CHAN_PR_FMT ", offchan: %s," " wait: %u, no cck: %s, dont wait for ack: %s", WIPHY_PR_ARG, WDEV_PR_ARG, CHAN_PR_ARG, - BOOL_TO_STR(__entry->offchan), __entry->wait, - BOOL_TO_STR(__entry->no_cck), - BOOL_TO_STR(__entry->dont_wait_for_ack)) + str_true_false(__entry->offchan), __entry->wait, + str_true_false(__entry->no_cck), + str_true_false(__entry->dont_wait_for_ack)) ); TRACE_EVENT(rdev_tx_control_port, @@ -2276,7 +2276,7 @@ TRACE_EVENT(rdev_tx_control_port, " proto: 0x%x, unencrypted: %s, link: %d", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->dest, be16_to_cpu(__entry->proto), - BOOL_TO_STR(__entry->unencrypted), + str_true_false(__entry->unencrypted), __entry->link_id) ); @@ -2894,7 +2894,7 @@ TRACE_EVENT(rdev_set_multicast_to_unicast, ), TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", unicast: %s", WIPHY_PR_ARG, NETDEV_PR_ARG, - BOOL_TO_STR(__entry->enabled)) + str_true_false(__entry->enabled)) ); DEFINE_EVENT(wiphy_wdev_evt, rdev_get_txq_stats, @@ -3225,7 +3225,7 @@ TRACE_EVENT(cfg80211_return_bool, TP_fast_assign( __entry->ret = ret; ), - TP_printk("returned %s", BOOL_TO_STR(__entry->ret)) + TP_printk("returned %s", str_true_false(__entry->ret)) ); DECLARE_EVENT_CLASS(cfg80211_netdev_mac_evt, @@ -3500,7 +3500,7 @@ TRACE_EVENT(cfg80211_mgmt_tx_status, __entry->ack = ack; ), TP_printk(WDEV_PR_FMT", cookie: %llu, ack: %s", - WDEV_PR_ARG, __entry->cookie, BOOL_TO_STR(__entry->ack)) + WDEV_PR_ARG, __entry->cookie, str_true_false(__entry->ack)) ); TRACE_EVENT(cfg80211_control_port_tx_status, @@ -3517,7 +3517,7 @@ TRACE_EVENT(cfg80211_control_port_tx_status, __entry->ack = ack; ), TP_printk(WDEV_PR_FMT", cookie: %llu, ack: %s", - WDEV_PR_ARG, __entry->cookie, BOOL_TO_STR(__entry->ack)) + WDEV_PR_ARG, __entry->cookie, str_true_false(__entry->ack)) ); TRACE_EVENT(cfg80211_rx_control_port, @@ -3542,7 +3542,7 @@ TRACE_EVENT(cfg80211_rx_control_port, ), TP_printk(NETDEV_PR_FMT ", len=%d, %pM, proto: 0x%x, unencrypted: %s, link: %d", NETDEV_PR_ARG, __entry->len, __entry->from, - __entry->proto, BOOL_TO_STR(__entry->unencrypted), + __entry->proto, str_true_false(__entry->unencrypted), __entry->link_id) ); @@ -3726,7 +3726,7 @@ TRACE_EVENT(cfg80211_probe_status, ), TP_printk(NETDEV_PR_FMT " addr:%pM, cookie: %llu, acked: %s", NETDEV_PR_ARG, __entry->addr, __entry->cookie, - BOOL_TO_STR(__entry->acked)) + str_true_false(__entry->acked)) ); TRACE_EVENT(cfg80211_cqm_pktloss_notify, @@ -3769,7 +3769,7 @@ TRACE_EVENT(cfg80211_pmksa_candidate_notify, ), TP_printk(NETDEV_PR_FMT ", index:%d, bssid: %pM, pre auth: %s", NETDEV_PR_ARG, __entry->index, __entry->bssid, - BOOL_TO_STR(__entry->preauth)) + str_true_false(__entry->preauth)) ); TRACE_EVENT(cfg80211_report_obss_beacon, @@ -3848,7 +3848,7 @@ TRACE_EVENT(cfg80211_scan_done, } ), TP_printk("aborted: %s, scan start (TSF): %llu, tsf_bssid: %pM", - BOOL_TO_STR(__entry->aborted), + str_true_false(__entry->aborted), (unsigned long long)__entry->scan_start_tsf, __entry->tsf_bssid) ); -- 2.54.0