From 4338caad720cadece92295bd8715b1cdee107ed5 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 8 Mar 2019 11:19:51 -0800 Subject: [PATCH] qcacld-3.0: Replace typedef tSap_Event 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 tSap_Event 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: I523f8642ef81b3e35b2bb7a2801f3b734b2f5865 CRs-Fixed: 2412716 --- core/hdd/src/wlan_hdd_hostapd.c | 8 ++++---- core/hdd/src/wlan_hdd_hostapd.h | 2 +- core/sap/inc/sap_api.h | 6 +++--- core/sap/src/sap_fsm.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index ee06d501d043..037183b26318 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1174,7 +1174,7 @@ static void wlan_hdd_sap_pre_cac_success(void *data) * Return: QDF_STATUS_SUCCESS on success, * other value on failure */ -static QDF_STATUS hdd_handle_acs_scan_event(tpSap_Event sap_event, +static QDF_STATUS hdd_handle_acs_scan_event(struct sap_event *sap_event, struct hdd_adapter *adapter) { struct hdd_context *hdd_ctx; @@ -1221,7 +1221,7 @@ static QDF_STATUS hdd_handle_acs_scan_event(tpSap_Event sap_event, return QDF_STATUS_SUCCESS; } #else -static QDF_STATUS hdd_handle_acs_scan_event(tpSap_Event sap_event, +static QDF_STATUS hdd_handle_acs_scan_event(struct sap_event *sap_event, struct hdd_adapter *adapter) { return QDF_STATUS_SUCCESS; @@ -1699,7 +1699,7 @@ static void hdd_hostapd_set_sap_key(struct hdd_adapter *adapter) } #endif -QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event sap_event, +QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, void *context) { struct hdd_adapter *adapter; @@ -6468,7 +6468,7 @@ int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, */ void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter) { - tSap_Event sap_event; + struct sap_event sap_event; int sta_id; struct sap_context *sap_ctx; diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 315852ac5b36..f05c4321d8ec 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -106,7 +106,7 @@ QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter, void hdd_softap_sta_disassoc(struct hdd_adapter *adapter, struct csr_del_sta_params *pDelStaParams); -QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event sap_event, +QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, void *context); /** * hdd_init_ap_mode() - to init the AP adaptor diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index c57975185faf..3799aecc51eb 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -377,7 +377,7 @@ struct sap_ch_change_ind { * structure in the union is defined in comment next to the structure */ -typedef struct sap_Event_s { +struct sap_event { eSapHddEvent sapHddEventCode; union { /*SAP_START_BSS_EVENT */ @@ -408,7 +408,7 @@ typedef struct sap_Event_s { struct sap_acs_scan_complete_event sap_acs_scan_comp; QDF_STATUS ch_change_rsp_status; } sapevt; -} tSap_Event, *tpSap_Event; +}; typedef struct sap_SSID { uint8_t length; @@ -749,7 +749,7 @@ bool sap_is_auto_channel_select(struct sap_context *sapcontext); QDF_STATUS wlansap_global_init(void); QDF_STATUS wlansap_global_deinit(void); -typedef QDF_STATUS (*tpWLAN_SAPEventCB)(tpSap_Event pSapEvent, +typedef QDF_STATUS (*tpWLAN_SAPEventCB)(struct sap_event *pSapEvent, void *pUsrContext); /** diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index fa114d386cc4..f1d4a2186c7a 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1318,7 +1318,7 @@ static QDF_STATUS sap_goto_init(struct sap_context *sap_ctx) /** * sap_handle_acs_scan_event() - handle acs scan event for SAP * @sap_context: ptSapContext - * @sap_event: tSap_Event + * @sap_event: struct sap_event * @status: status of acs scan * * The function is to handle the eSAP_ACS_SCAN_SUCCESS_EVENT event. @@ -1326,7 +1326,7 @@ static QDF_STATUS sap_goto_init(struct sap_context *sap_ctx) * Return: void */ static void sap_handle_acs_scan_event(struct sap_context *sap_context, - tSap_Event *sap_event, eSapStatus status) + struct sap_event *sap_event, eSapStatus status) { sap_event->sapHddEventCode = eSAP_ACS_SCAN_SUCCESS_EVENT; sap_event->sapevt.sap_acs_scan_comp.status = status; @@ -1337,7 +1337,7 @@ static void sap_handle_acs_scan_event(struct sap_context *sap_context, } #else static void sap_handle_acs_scan_event(struct sap_context *sap_context, - tSap_Event *sap_event, eSapStatus status) + struct sap_event *sap_event, eSapStatus status) { } #endif @@ -1453,7 +1453,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx, void *context) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - tSap_Event sap_ap_event = {0}; + struct sap_event sap_ap_event = {0}; struct mac_context *mac_ctx; struct oem_channel_info *chaninfo; tSap_StationAssocIndication *assoc_ind;