qcacld-3.0: Fix kernel checkpatch warnings in wlan_hdd_wmm.h

Fix kernel checkpatch warnings in wlan_hdd_wmm.h.

Change-Id: I813fc4adc3f1661b76481f8df6d073d27550a5d6
CRs-Fixed: 2024274

4 files changed, 37 insertions, 46 deletions

diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index f996e2870d41..33b6de83c919 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -10591,7 +10591,7 @@ struct hdd_config {
 	uint8_t nDataInactivityTimeout;
 
 	/* WMM QoS Configuration */
-	hdd_wmm_user_mode_t WmmMode;
+	enum hdd_wmm_user_mode WmmMode;
 	bool b80211eIsEnabled;
 	uint8_t UapsdMask;      /* what ACs to setup U-APSD for at assoc */
 	uint32_t InfraUapsdVoSrvIntv;
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 65e0cb0a86c2..3e94208aca14 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1097,7 +1097,7 @@ struct hdd_adapter_s {
 	uint32_t mgmtTxCompletionStatus;
 
 	/* WMM Status */
-	hdd_wmm_status_t hddWmmStatus;
+	struct hdd_wmm_status hddWmmStatus;
 /*************************************************************
  */
 /*************************************************************
diff --git a/core/hdd/inc/wlan_hdd_wmm.h b/core/hdd/inc/wlan_hdd_wmm.h
index 3944386cfe66..84cd0a87add7 100644
--- a/core/hdd/inc/wlan_hdd_wmm.h
+++ b/core/hdd/inc/wlan_hdd_wmm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012,2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012,2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -74,14 +74,6 @@
 /* Type Declarations */
 
 /**
- * enum hdd_wmm_classification: types of classification supported
- */
-typedef enum hdd_wmm_classification {
-	HDD_WMM_CLASSIFICATION_DSCP = 0,
-	HDD_WMM_CLASSIFICATION_802_1Q = 1
-} hdd_wmm_classification_t;
-
-/**
  * enum hdd_wmm_user_mode - WMM modes of operation
  *
  * @HDD_WMM_USER_MODE_AUTO: STA can associate with any AP, & HDD looks at
@@ -91,11 +83,11 @@ typedef enum hdd_wmm_classification {
  *	STA associates with a QAP only
  * @HDD_WMM_USER_MODE_NO_QOS - Join any AP, but uapsd is disabled
  */
-typedef enum hdd_wmm_user_mode {
+enum hdd_wmm_user_mode {
 	HDD_WMM_USER_MODE_AUTO = 0,
 	HDD_WMM_USER_MODE_QBSS_ONLY = 1,
 	HDD_WMM_USER_MODE_NO_QOS = 2,
-} hdd_wmm_user_mode_t;
+};
 
 /* UAPSD Mask bits */
 /* (Bit0:VO; Bit1:VI; Bit2:BK; Bit3:BE all other bits are ignored) */
@@ -123,7 +115,7 @@ typedef enum hdd_wmm_user_mode {
  * @magic: magic number used to verify that this is a valid context when
  *	referenced anonymously
  */
-typedef struct hdd_wmm_qos_context {
+struct hdd_wmm_qos_context {
 	struct list_head node;
 	uint32_t handle;
 	uint32_t qosFlowId;
@@ -133,7 +125,7 @@ typedef struct hdd_wmm_qos_context {
 	struct work_struct wmmAcSetupImplicitQos;
 	uint32_t magic;
 	bool is_inactivity_timer_running;
-} hdd_wmm_qos_context_t;
+};
 
 /**
  * struct hdd_wmm_ac_status - WMM related per-AC state & status info
@@ -157,7 +149,7 @@ typedef struct hdd_wmm_qos_context {
  * @wmmPrevTrafficCnt - TX counter used for inactivity detection
  * @wmmInactivityTimer - timer used for inactivity detection
  */
-typedef struct hdd_wmm_ac_status {
+struct hdd_wmm_ac_status {
 	bool wmmAcAccessRequired;
 	bool wmmAcAccessNeeded;
 	bool wmmAcAccessPending;
@@ -177,8 +169,7 @@ typedef struct hdd_wmm_ac_status {
 	uint32_t wmmPrevTrafficCnt;
 	qdf_mc_timer_t wmmInactivityTimer;
 #endif
-
-} hdd_wmm_ac_status_t;
+};
 
 /**
  * struct hdd_wmm_status - WMM status maintained per-adapter
@@ -188,13 +179,13 @@ typedef struct hdd_wmm_ac_status {
  * @wmmQap - is this connected to a QoS-enabled AP?
  * @wmmQosConnection - is this a QoS connection?
  */
-typedef struct hdd_wmm_status {
+struct hdd_wmm_status {
 	struct list_head wmmContextList;
 	struct mutex wmmLock;
-	hdd_wmm_ac_status_t wmmAcStatus[WLAN_MAX_AC];
+	struct hdd_wmm_ac_status wmmAcStatus[WLAN_MAX_AC];
 	bool wmmQap;
 	bool wmmQosConnection;
-} hdd_wmm_status_t;
+};
 
 extern const uint8_t hdd_qdisc_ac_to_tl_ac[];
 extern const uint8_t hdd_wmm_up_to_ac_map[];
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index dc26b9d62fe5..14a75d7a716f 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -136,11 +136,11 @@ const uint8_t hdd_linux_up_to_ac_map[HDD_WMM_UP_TO_AC_MAP_SIZE] = {
  *
  * Return: None
  */
-static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
+static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 {
 	hdd_adapter_t *pAdapter = pQosContext->pAdapter;
 	sme_ac_enum_type acType = pQosContext->acType;
-	hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
+	struct hdd_wmm_ac_status *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 	QDF_STATUS status;
 	uint32_t service_interval;
@@ -214,11 +214,11 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
  *
  * Return: None
  */
-static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
+static void hdd_wmm_disable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 {
 	hdd_adapter_t *pAdapter = pQosContext->pAdapter;
 	sme_ac_enum_type acType = pQosContext->acType;
-	hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
+	struct hdd_wmm_ac_status *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
 	QDF_STATUS status;
 
 	/* have we previously enabled UAPSD? */
@@ -249,7 +249,7 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
  *
  * Return: None
  */
-static void hdd_wmm_free_context(hdd_wmm_qos_context_t *pQosContext)
+static void hdd_wmm_free_context(struct hdd_wmm_qos_context *pQosContext)
 {
 	hdd_adapter_t *pAdapter;
 
@@ -290,7 +290,7 @@ static void hdd_wmm_free_context(hdd_wmm_qos_context_t *pQosContext)
  * Return: None
  */
 #define MAX_NOTIFY_LEN 50
-static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext)
+static void hdd_wmm_notify_app(struct hdd_wmm_qos_context *pQosContext)
 {
 	hdd_adapter_t *pAdapter;
 	union iwreq_data wrqu;
@@ -340,9 +340,9 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext)
  */
 static void hdd_wmm_inactivity_timer_cb(void *user_data)
 {
-	hdd_wmm_qos_context_t *pQosContext = user_data;
+	struct hdd_wmm_qos_context *pQosContext = user_data;
 	hdd_adapter_t *pAdapter;
-	hdd_wmm_ac_status_t *pAc;
+	struct hdd_wmm_ac_status *pAc;
 	hdd_wlan_wmm_status_e status;
 	QDF_STATUS qdf_status;
 	uint32_t currentTrafficCnt = 0;
@@ -404,13 +404,13 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data)
  * Return: QDF_STATUS enumeration
  */
 static QDF_STATUS
-hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext,
+hdd_wmm_enable_inactivity_timer(struct hdd_wmm_qos_context *pQosContext,
 				uint32_t inactivityTime)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 	hdd_adapter_t *pAdapter = pQosContext->pAdapter;
 	sme_ac_enum_type acType = pQosContext->acType;
-	hdd_wmm_ac_status_t *pAc;
+	struct hdd_wmm_ac_status *pAc;
 
 	pAdapter = pQosContext->pAdapter;
 	pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
@@ -457,11 +457,11 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext,
  * Return: QDF_STATUS enumeration
  */
 static QDF_STATUS
-hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext)
+hdd_wmm_disable_inactivity_timer(struct hdd_wmm_qos_context *pQosContext)
 {
 	hdd_adapter_t *pAdapter = pQosContext->pAdapter;
 	sme_ac_enum_type acType = pQosContext->acType;
-	hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
+	struct hdd_wmm_ac_status *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 
 	/* Clear the timer and the counter */
@@ -506,10 +506,10 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 				       sme_QosStatusType smeStatus,
 				       uint32_t qosFlowId)
 {
-	hdd_wmm_qos_context_t *pQosContext = hddCtx;
+	struct hdd_wmm_qos_context *pQosContext = hddCtx;
 	hdd_adapter_t *pAdapter;
 	sme_ac_enum_type acType;
-	hdd_wmm_ac_status_t *pAc;
+	struct hdd_wmm_ac_status *pAc;
 
 	hdd_info("Entered, context %p", pQosContext);
 
@@ -1010,11 +1010,11 @@ int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr)
  */
 static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 {
-	hdd_wmm_qos_context_t *pQosContext =
-		container_of(work, hdd_wmm_qos_context_t, wmmAcSetupImplicitQos);
+	struct hdd_wmm_qos_context *pQosContext =
+		container_of(work, struct hdd_wmm_qos_context, wmmAcSetupImplicitQos);
 	hdd_adapter_t *pAdapter;
 	sme_ac_enum_type acType;
-	hdd_wmm_ac_status_t *pAc;
+	struct hdd_wmm_ac_status *pAc;
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	sme_QosStatusType smeStatus;
 #endif
@@ -1306,7 +1306,7 @@ QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter)
  */
 QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter)
 {
-	hdd_wmm_ac_status_t *pAcStatus;
+	struct hdd_wmm_ac_status *pAcStatus;
 	sme_ac_enum_type acType;
 
 	hdd_info("Entered");
@@ -1344,7 +1344,7 @@ QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter)
  */
 QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter)
 {
-	hdd_wmm_ac_status_t *pAcStatus;
+	struct hdd_wmm_ac_status *pAcStatus;
 	sme_ac_enum_type acType;
 
 	hdd_info("Entered");
@@ -1373,7 +1373,7 @@ QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter)
  */
 QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter)
 {
-	hdd_wmm_qos_context_t *pQosContext;
+	struct hdd_wmm_qos_context *pQosContext;
 
 	hdd_info("Entered");
 
@@ -1381,7 +1381,7 @@ QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter)
 	while (!list_empty(&pAdapter->hddWmmStatus.wmmContextList)) {
 		pQosContext =
 			list_first_entry(&pAdapter->hddWmmStatus.wmmContextList,
-					 hdd_wmm_qos_context_t, node);
+					 struct hdd_wmm_qos_context, node);
 #ifdef FEATURE_WLAN_ESE
 		hdd_wmm_disable_inactivity_timer(pQosContext);
 #endif
@@ -1687,7 +1687,7 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter,
 QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 				  sme_ac_enum_type acType, bool *pGranted)
 {
-	hdd_wmm_qos_context_t *pQosContext;
+	struct hdd_wmm_qos_context *pQosContext;
 
 	QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: Entered for AC %d", __func__, acType);
@@ -2079,7 +2079,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 				    uint32_t handle,
 				    sme_QosWmmTspecInfo *pTspec)
 {
-	hdd_wmm_qos_context_t *pQosContext;
+	struct hdd_wmm_qos_context *pQosContext;
 	hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_SETUP_SUCCESS;
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 	sme_QosStatusType smeStatus;
@@ -2248,7 +2248,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
  */
 hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle)
 {
-	hdd_wmm_qos_context_t *pQosContext;
+	struct hdd_wmm_qos_context *pQosContext;
 	bool found = false;
 	sme_ac_enum_type acType = 0;
 	uint32_t qosFlowId = 0;
@@ -2358,7 +2358,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle)
  */
 hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle)
 {
-	hdd_wmm_qos_context_t *pQosContext;
+	struct hdd_wmm_qos_context *pQosContext;
 	hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST;
 
 	hdd_info("Entered with handle 0x%x", handle);