From 7a62733456efed210da5aaa5fc698db7f96b80fd Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 28 Aug 2017 12:05:55 -0700 Subject: [PATCH] qcacld-3.0: Replace hdd_context_t in wlan_hdd_conc_ut.[ch] The Linux Coding Style enumerates a few special cases where typedefs are useful, but stresses "NEVER EVER use a typedef unless you can clearly match one of those rules." The hdd_context_t typedef does not meet any of those criteria, so replace references to it with a reference to the underlying struct. Change-Id: I80d863c19d4a7330a87c6ea74fbfcefee56cca2c CRs-Fixed: 2100206 --- core/hdd/inc/wlan_hdd_conc_ut.h | 24 ++++++++++++------------ core/hdd/src/wlan_hdd_conc_ut.c | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_conc_ut.h b/core/hdd/inc/wlan_hdd_conc_ut.h index a7541b610b93..5dcea29ce67f 100644 --- a/core/hdd/inc/wlan_hdd_conc_ut.h +++ b/core/hdd/inc/wlan_hdd_conc_ut.h @@ -33,25 +33,25 @@ #include "wlan_hdd_main.h" #include "wlan_policy_mgr_api.h" #ifdef MPC_UT_FRAMEWORK -void clean_report(hdd_context_t *hdd_ctx); -void fill_report(hdd_context_t *hdd_ctx, char *title, +void clean_report(struct hdd_context *hdd_ctx); +void fill_report(struct hdd_context *hdd_ctx, char *title, uint32_t first_persona, uint32_t second_persona, uint32_t third_persona, uint32_t chnl_1st_conn, uint32_t chnl_2nd_conn, uint32_t chnl_3rd_conn, bool status, enum policy_mgr_pcl_type pcl_type, char *reason, uint8_t *pcl); -void print_report(hdd_context_t *hdd_ctx); -void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx); -void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, +void print_report(struct hdd_context *hdd_ctx); +void wlan_hdd_one_connection_scenario(struct hdd_context *hdd_ctx); +void wlan_hdd_two_connections_scenario(struct hdd_context *hdd_ctx, uint8_t first_chnl, enum policy_mgr_chain_mode first_chain_mask); -void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, +void wlan_hdd_three_connections_scenario(struct hdd_context *hdd_ctx, uint8_t first_chnl, uint8_t second_chnl, enum policy_mgr_chain_mode chain_mask, uint8_t use_same_mac); #else -static inline void clean_report(hdd_context_t *hdd_ctx) +static inline void clean_report(struct hdd_context *hdd_ctx) { } -static inline void fill_report(hdd_context_t *hdd_ctx, char *title, +static inline void fill_report(struct hdd_context *hdd_ctx, char *title, uint32_t first_persona, uint32_t second_persona, uint32_t third_persona, uint32_t chnl_1st_conn, uint32_t chnl_2nd_conn, uint32_t chnl_3rd_conn, bool status, enum policy_mgr_pcl_type pcl_type, char *reason, @@ -59,20 +59,20 @@ static inline void fill_report(hdd_context_t *hdd_ctx, char *title, { } -static inline void print_report(hdd_context_t *hdd_ctx) +static inline void print_report(struct hdd_context *hdd_ctx) { } -static inline void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx) +static inline void wlan_hdd_one_connection_scenario(struct hdd_context *hdd_ctx) { } -static inline void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, +static inline void wlan_hdd_two_connections_scenario(struct hdd_context *hdd_ctx, uint8_t first_chnl, enum policy_mgr_chain_mode first_chain_mask) { } -static inline void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, +static inline void wlan_hdd_three_connections_scenario(struct hdd_context *hdd_ctx, uint8_t first_chnl, uint8_t second_chnl, enum policy_mgr_chain_mode chain_mask, uint8_t use_same_mac) { diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index 108802ffbaf7..11cf37bb9408 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/core/hdd/src/wlan_hdd_conc_ut.c @@ -146,7 +146,7 @@ static const char *pcl_type_to_string(uint8_t idx) } } -void clean_report(hdd_context_t *hdd_ctx) +void clean_report(struct hdd_context *hdd_ctx) { uint32_t idx = 0; @@ -157,7 +157,7 @@ void clean_report(hdd_context_t *hdd_ctx) report_idx = 0; } -void print_report(hdd_context_t *hdd_ctx) +void print_report(struct hdd_context *hdd_ctx) { uint32_t idx = 0; @@ -175,7 +175,7 @@ void print_report(hdd_context_t *hdd_ctx) pr_info("+----------Report end -----------+\n"); } -void fill_report(hdd_context_t *hdd_ctx, char *title, +void fill_report(struct hdd_context *hdd_ctx, char *title, uint32_t first_persona, uint32_t second_persona, uint32_t third_persona, uint32_t chnl_1st_conn, uint32_t chnl_2nd_conn, uint32_t chnl_3rd_conn, bool status, enum policy_mgr_pcl_type pcl_type, char *reason, @@ -248,7 +248,7 @@ void fill_report(hdd_context_t *hdd_ctx, char *title, report_idx++; } -static bool wlan_hdd_validate_pcl(hdd_context_t *hdd_ctx, +static bool wlan_hdd_validate_pcl(struct hdd_context *hdd_ctx, enum policy_mgr_pcl_type pcl_type, uint8_t *pcl, uint32_t pcl_len, uint8_t first_connection_chnl, uint8_t second_connection_chnl, char *reason, uint32_t reason_length) @@ -623,7 +623,7 @@ static void wlan_hdd_map_subtypes_hdd_wma(enum policy_mgr_con_mode *dst, *dst = *src; } -void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx) +void wlan_hdd_one_connection_scenario(struct hdd_context *hdd_ctx) { enum policy_mgr_con_mode sub_type; enum policy_mgr_conc_priority_mode system_pref = @@ -674,7 +674,7 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx) } } -void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, +void wlan_hdd_two_connections_scenario(struct hdd_context *hdd_ctx, uint8_t first_chnl, enum policy_mgr_chain_mode first_chain_mask) { uint8_t vdevid = 0, tx_stream = 2, rx_stream = 2; @@ -755,7 +755,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, } } -void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, +void wlan_hdd_three_connections_scenario(struct hdd_context *hdd_ctx, uint8_t first_chnl, uint8_t second_chnl, enum policy_mgr_chain_mode chain_mask, uint8_t use_same_mac) {