From d686ba7411b07211338686b962e082ca6ac7cba6 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 6 Feb 2019 22:36:42 -0800 Subject: [PATCH] qcacld-3.0: Replace typedef tSirRoamOffloadScanRsp 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 tSirRoamOffloadScanRsp typedef does not meet any of those criteria, so replace it (and the "tp" variant) with a reference to the underlying struct. Further note the Linux Coding Style frowns upon mixed-case names and so-called Hungarian notation, so in conjunction rename the underlying struct to be in compliance. Change-Id: I8c9a3680d7b78e99fecd64d8dee095b28a502ce1 CRs-Fixed: 2396067 --- core/mac/inc/sir_api.h | 4 ++-- core/sme/inc/csr_internal.h | 4 ++-- core/sme/src/csr/csr_api_roam.c | 6 +++--- core/wma/src/wma_scan_roam.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index d45fe888ae06..201f180db137 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -2347,10 +2347,10 @@ struct roam_offload_scan_req { struct wmi_bss_load_config bss_load_config; }; -typedef struct sSirRoamOffloadScanRsp { +struct roam_offload_scan_rsp { uint8_t sessionId; uint32_t reason; -} tSirRoamOffloadScanRsp, *tpSirRoamOffloadScanRsp; +}; /*--------------------------------------------------------------------------- Packet Filtering Parameters diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index ba0fe586ca4d..3264e66525f3 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1009,11 +1009,11 @@ QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, uint8_t channel); #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) QDF_STATUS csr_roam_offload_scan_rsp_hdlr(struct mac_context *mac, - tpSirRoamOffloadScanRsp scanOffloadRsp); + struct roam_offload_scan_rsp *scanOffloadRsp); #else static inline QDF_STATUS csr_roam_offload_scan_rsp_hdlr( struct mac_context *mac, - tpSirRoamOffloadScanRsp scanOffloadRsp) + struct roam_offload_scan_rsp *scanOffloadRsp) { return QDF_STATUS_E_NOSUPPORT; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 622fd8893938..68710c4ea171 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18929,9 +18929,9 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id, return status; } -QDF_STATUS csr_roam_offload_scan_rsp_hdlr(struct mac_context *mac, - tpSirRoamOffloadScanRsp - scanOffloadRsp) +QDF_STATUS +csr_roam_offload_scan_rsp_hdlr(struct mac_context *mac, + struct roam_offload_scan_rsp *scanOffloadRsp) { switch (scanOffloadRsp->reason) { case 0: diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 9bec92d0a64f..c7b9f6f1f9ca 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1788,7 +1788,7 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, if (roam_req->reason == REASON_OS_REQUESTED_ROAMING_NOW) { struct scheduler_msg cds_msg = {0}; - tSirRoamOffloadScanRsp *scan_offload_rsp; + struct roam_offload_scan_rsp *scan_offload_rsp; scan_offload_rsp = qdf_mem_malloc(sizeof(*scan_offload_rsp));