wlan: Checkpatch fixes for WLAN prima LA driver
The diff contains fixes for the following 2 checkpatch errors:
1) WARNING: __packed is preferred over __attribute__((packed))
2) WARNING: Statements terminations use 1 semicolon
Change-Id: I711d060af60b09b680daca675c79eea78c9009b9
CR-Fixed: NA
diff --git a/CORE/BAP/src/bapRsn8021xAuthFsm.c b/CORE/BAP/src/bapRsn8021xAuthFsm.c
index a1db116..7256c69 100644
--- a/CORE/BAP/src/bapRsn8021xAuthFsm.c
+++ b/CORE/BAP/src/bapRsn8021xAuthFsm.c
@@ -356,7 +356,7 @@
checkTransition(fsm, arg);
- return ANI_OK;;
+ return ANI_OK;
}
diff --git a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
index 6bf3ba6..158afcd 100644
--- a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
+++ b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
@@ -632,7 +632,7 @@
{
retVal = ANI_ERROR;
VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "Supp could not send eapol. Disconnect\n" );
- break;;
+ break;
}
//FIX_RSN there is no need to set GTK retVal = setGtk(fsm->suppCtx, rxDesc->keyRecvSeqCounter);
diff --git a/CORE/BAP/src/btampFsm.c b/CORE/BAP/src/btampFsm.c
index 4819fe9..dc8d5c7 100644
--- a/CORE/BAP/src/btampFsm.c
+++ b/CORE/BAP/src/btampFsm.c
@@ -212,7 +212,7 @@
}
/* Set the Group Key */
- vos_mem_copy( pSetKeyInfo->peerMac, groupMac, sizeof( tAniMacAddr ) );;
+ vos_mem_copy( pSetKeyInfo->peerMac, groupMac, sizeof( tAniMacAddr ) );
halStatus = sme_RoamSetKey(
hHal,
btampContext->sessionId,
diff --git a/CORE/HDD/inc/wlan_hdd_ether.h b/CORE/HDD/inc/wlan_hdd_ether.h
index a8f9e45..37880da 100644
--- a/CORE/HDD/inc/wlan_hdd_ether.h
+++ b/CORE/HDD/inc/wlan_hdd_ether.h
@@ -57,7 +57,7 @@
unsigned char ssap;
unsigned char ctrl;
unsigned char oui[WLAN_SNAP_OUI_LEN];
-} __attribute__((packed));
+} __packed;
struct wlan_8023 {
unsigned char h_dest[ETH_ALEN];
@@ -65,7 +65,7 @@
__be16 h_len;
struct wlan_snap_hdr h_snap;
__be16 h_proto;
-} __attribute__((packed));
+} __packed;
struct wlan_8023_vlan {
unsigned char h_dest[ETH_ALEN];
@@ -75,7 +75,7 @@
__be16 h_len;
struct wlan_snap_hdr h_snap;
__be16 h_proto;
-} __attribute__((packed));
+} __packed;
union generic_ethhdr {
struct ethhdr eth_II;
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 9a4909c..ffe34fb 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -245,7 +245,7 @@
WAPI_AUTH_MODE_OPEN = 0,
WAPI_AUTH_MODE_PSK = 1,
WAPI_AUTH_MODE_CERT
-} __attribute__((packed));
+} __packed;
typedef enum _WAPIAuthMode WAPIAuthMode;
/** WAPI Work mode structure definition */
@@ -255,7 +255,7 @@
struct _WAPI_FUNCTION_MODE
{
unsigned char wapiMode;
-}__attribute__((packed));
+}__packed;
typedef struct _WAPI_FUNCTION_MODE WAPI_FUNCTION_MODE;
@@ -278,7 +278,7 @@
v_U16_t wapiCability;
v_U16_t bkidCount;
WAPI_BKID bkidList[MAX_NUM_BKIDS];
-} __attribute__((packed));
+} __packed;
typedef struct _WAPI_AssocInfo WAPI_AssocInfo;
typedef struct _WAPI_AssocInfo *pWAPI_IEAssocInfo;
@@ -288,7 +288,7 @@
{
PAIRWISE_KEY, //0
GROUP_KEY //1
-}__attribute__((packed));
+}__packed;
typedef enum _WAPIKeyType WAPIKeyType;
/** WAPI KEY Direction definition */
@@ -298,7 +298,7 @@
Rx,
Tx,
Rx_Tx
-}__attribute__((packed));
+}__packed;
typedef enum _KEY_DIRECTION WAPI_KEY_DIRECTION;
@@ -314,7 +314,7 @@
int wpickLen;
v_U8_t wpick[MAX_WPI_KEY_LENGTH];
v_U8_t pn[MAX_NUM_PN]; /*reserved for future use*/
-}__attribute__((packed));
+}__packed;
typedef struct WLAN_WAPI_KEY WLAN_WAPI_KEY;
typedef struct WLAN_WAPI_KEY *pWLAN_WAPI_KEY;
@@ -330,7 +330,7 @@
v_U32_t length;
v_U32_t BKIDCount;
WAPI_BKID BKID[1];
-}__attribute__((packed));
+}__packed;
typedef struct _WLAN_BKID_LIST WLAN_BKID_LIST;
typedef struct _WLAN_BKID_LIST *pWLAN_BKID_LIST;
@@ -343,7 +343,7 @@
v_BOOL_t fIsWapiSta;
v_MACADDR_t cachedMacAddr;
v_UCHAR_t wapiAuthMode;
-}__attribute__((packed));
+}__packed;
typedef struct hdd_wapi_info_s hdd_wapi_info_t;
#endif /* FEATURE_WLAN_WAPI */
diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index e463c94..23463cb 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -389,7 +389,7 @@
{
int i;
- numBasicRates = pDot11SuppRates->num_rates;;
+ numBasicRates = pDot11SuppRates->num_rates;
for (i=0; i<pDot11SuppRates->num_rates; i++)
{
if (0 != (pDot11SuppRates->rates[i] & 0x7F))
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index fb8e6a9..b4a1c7d 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -121,7 +121,7 @@
else
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test PASS hdd_tx_fetch_packet_cbk", __FUNCTION__);
- status = hdd_tx_complete_cbk(pAdapter->pvosContext, &dummyPacket, VOS_STATUS_SUCCESS);;
+ status = hdd_tx_complete_cbk(pAdapter->pvosContext, &dummyPacket, VOS_STATUS_SUCCESS);
if (status != VOS_STATUS_SUCCESS)
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,"%s: Test FAIL hdd_tx_complete_cbk", __FUNCTION__);
else
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index ac96717..b3e2482 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -3292,7 +3292,7 @@
{
case WE_SET_11D_STATE:
{
- tSmeConfigParams smeConfig;;
+ tSmeConfigParams smeConfig;
if((ENABLE_11D == set_value) || (DISABLE_11D == set_value)) {
sme_GetConfigParam(hHal,&smeConfig);
@@ -3685,7 +3685,7 @@
{
case WE_GET_11D_STATE:
{
- tSmeConfigParams smeConfig;;
+ tSmeConfigParams smeConfig;
sme_GetConfigParam(hHal,&smeConfig);
diff --git a/CORE/MAC/inc/aniCompiler.h b/CORE/MAC/inc/aniCompiler.h
index a1c4288..0a063ed 100644
--- a/CORE/MAC/inc/aniCompiler.h
+++ b/CORE/MAC/inc/aniCompiler.h
@@ -105,7 +105,7 @@
#define __ani_attr_aligned_32
#elif defined(__GNUC__)
#define __ani_attr_pre_packed
-#define __ani_attr_packed __attribute__((packed))
+#define __ani_attr_packed __packed
#define __ani_attr_aligned_2 __attribute__((aligned(2)))
#define __ani_attr_aligned_4 __attribute__((aligned(4)))
#define __ani_attr_aligned_8 __attribute__((aligned(8)))
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 9395be3..b6ab97a 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -2878,7 +2878,7 @@
"quest(0x%08x).\n"), nStatus );
}
- nBytes = nPayload + sizeof( tSirMacMgmtHdr ) + nAddIELen; ;
+ nBytes = nPayload + sizeof( tSirMacMgmtHdr ) + nAddIELen;
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
limLog( pMac, LOGE, FL("FT IE Reassoc Req (%d).\n"),
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index e5324d1..353e155 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -1350,7 +1350,7 @@
/* Supplied channels are nt in the operating band so set the default
channels for the given operating band */
startChannel = rfChannels[bandStartChannel].channelNum;
- endChannel = rfChannels[bandEndChannel].channelNum;;
+ endChannel = rfChannels[bandEndChannel].channelNum;
}
/*Search for the Active channels in the given range */
@@ -1374,7 +1374,7 @@
/* There is no active channel in the supplied range.Updating the config
with the default channels in the given band so that we can select the best channel in the sub-band*/
startChannel = rfChannels[bandStartChannel].channelNum;
- endChannel = rfChannels[bandEndChannel].channelNum;;
+ endChannel = rfChannels[bandEndChannel].channelNum;
}
if (ccmCfgSetInt(hHal, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND,
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 38fee32..3f3b942 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -2826,7 +2826,7 @@
if ( csrRatesIsDot11RateSupported( pMac, pIes->SuppRates.rates[ i ] ) )
{
*pDstRate++ = pIes->SuppRates.rates[ i ];
- pOpRateSet->numRates++;;
+ pOpRateSet->numRates++;
}
}
}
@@ -7771,7 +7771,7 @@
smsLog( pMac, LOGE, FL(" error status \n"), status );
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
removeKeyEvent.eventId = WLAN_SECURITY_EVENT_REMOVE_KEY_RSP;
- removeKeyEvent.status = WLAN_SECURITY_STATUS_FAILURE;;
+ removeKeyEvent.status = WLAN_SECURITY_STATUS_FAILURE;
WLAN_VOS_DIAG_EVENT_REPORT(&removeKeyEvent, EVENT_WLAN_SECURITY);
#endif //FEATURE_WLAN_DIAG_SUPPORT_CSR
csrRoamCallCallback( pMac, sessionId, NULL, pCommand->u.removeKeyCmd.roamId, eCSR_ROAM_REMOVE_KEY_COMPLETE, eCSR_ROAM_RESULT_FAILURE);
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 33e3736..f5300ab 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -4086,7 +4086,7 @@
if( pIes->SSID.present && !csrIsNULLSSID(pIes->SSID.ssid, pIes->SSID.num_ssid) )
{
//SSID not hidden
- tANI_U32 len = pIes->SSID.num_ssid;;
+ tANI_U32 len = pIes->SSID.num_ssid;
if (len > SIR_MAC_MAX_SSID_LENGTH)
{
// truncate to fit in our struct
diff --git a/CORE/VOSS/inc/i_vos_diag_core_log.h b/CORE/VOSS/inc/i_vos_diag_core_log.h
index 4ac2bae..8a85fb7 100644
--- a/CORE/VOSS/inc/i_vos_diag_core_log.h
+++ b/CORE/VOSS/inc/i_vos_diag_core_log.h
@@ -64,7 +64,7 @@
/*Time Stamp hi*/
v_U32_t ts_hi;
-}__attribute__((packed)) log_hdr_type;
+}__packed log_hdr_type;
#ifdef __cplusplus
diff --git a/CORE/VOSS/inc/i_vos_types.h b/CORE/VOSS/inc/i_vos_types.h
index 8d646e2..5b16305 100644
--- a/CORE/VOSS/inc/i_vos_types.h
+++ b/CORE/VOSS/inc/i_vos_types.h
@@ -148,12 +148,6 @@
#define VOS_INLINE_FN static inline
-#define VOS_PACK_STRUCT_1 __attribute__ ((aligned(1), packed))
-#define VOS_PACK_STRUCT_2 __attribute__ ((aligned(2), packed))
-#define VOS_PACK_STRUCT_4 __attribute__ ((aligned(4), packed))
-#define VOS_PACK_STRUCT_8 __attribute__ ((aligned(8), packed))
-#define VOS_PACK_STRUCT_16 __attribute__ ((aligned(16), packed))
-
#else
#error "Compiling with an unknown compiler!!"
#endif
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 90409f8..5ed8e65 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -3475,7 +3475,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_UPDATE_UAPSD_PARAM_REQ;
wdiEventData.pEventData = pwdiUpdateUapsdReqParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiUpdateUapsdReqParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiUpdateUapsdReqParams);
wdiEventData.pCBfnc = wdiUpdateUapsdParamsCb;
wdiEventData.pUserData = pUserData;
@@ -3653,7 +3653,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_SET_BEACON_FILTER_REQ;
wdiEventData.pEventData = pwdiBeaconFilterReqParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiBeaconFilterReqParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiBeaconFilterReqParams);
wdiEventData.pCBfnc = wdiBeaconFilterCb;
wdiEventData.pUserData = pUserData;
@@ -3711,7 +3711,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_REM_BEACON_FILTER_REQ;
wdiEventData.pEventData = pwdiBeaconFilterReqParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiBeaconFilterReqParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiBeaconFilterReqParams);
wdiEventData.pCBfnc = wdiBeaconFilterCb;
wdiEventData.pUserData = pUserData;
@@ -3771,7 +3771,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_SET_RSSI_THRESHOLDS_REQ;
wdiEventData.pEventData = pwdiRSSIThresholdsParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiRSSIThresholdsParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiRSSIThresholdsParams);
wdiEventData.pCBfnc = wdiSetRSSIThresholdsCb;
wdiEventData.pUserData = pUserData;
@@ -3831,7 +3831,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_HOST_OFFLOAD_REQ;
wdiEventData.pEventData = pwdiHostOffloadParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiHostOffloadParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiHostOffloadParams);
wdiEventData.pCBfnc = wdiHostOffloadCb;
wdiEventData.pUserData = pUserData;
@@ -3952,7 +3952,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_WOWL_ADD_BC_PTRN_REQ;
wdiEventData.pEventData = pwdiWowlAddBcPtrnParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiWowlAddBcPtrnParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiWowlAddBcPtrnParams);
wdiEventData.pCBfnc = wdiWowlAddBcPtrnCb;
wdiEventData.pUserData = pUserData;
@@ -4011,7 +4011,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_WOWL_DEL_BC_PTRN_REQ;
wdiEventData.pEventData = pwdiWowlDelBcPtrnParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiWowlDelBcPtrnParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiWowlDelBcPtrnParams);
wdiEventData.pCBfnc = wdiWowlDelBcPtrnCb;
wdiEventData.pUserData = pUserData;
@@ -4071,7 +4071,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_WOWL_ENTER_REQ;
wdiEventData.pEventData = pwdiWowlEnterParams;
- wdiEventData.uEventDataSize = sizeof(*pwdiWowlEnterParams);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiWowlEnterParams);
wdiEventData.pCBfnc = wdiWowlEnterCb;
wdiEventData.pUserData = pUserData;
@@ -13723,7 +13723,7 @@
//all DPU indices are the same for self STA
wdiAddSTAParam.bcastDpuIndex = wdiRspParams.usSelfStaDpuId;
wdiAddSTAParam.bcastMgmtDpuIndex = wdiRspParams.usSelfStaDpuId;
- wdiAddSTAParam.dpuIndex = wdiRspParams.usSelfStaDpuId;;
+ wdiAddSTAParam.dpuIndex = wdiRspParams.usSelfStaDpuId;
wpalMemoryCopy(wdiAddSTAParam.staMacAddr, wdiRspParams.macSelfSta,
WDI_MAC_ADDR_LEN);
wdiAddSTAParam.ucStaType = WDI_STA_ENTRY_SELF; /* 0 - self */
@@ -24241,7 +24241,7 @@
------------------------------------------------------------------------*/
wdiEventData.wdiRequest = WDI_GTK_OFFLOAD_REQ;
wdiEventData.pEventData = pwdiGtkOffloadReqMsg;
- wdiEventData.uEventDataSize = sizeof(*pwdiGtkOffloadReqMsg);;
+ wdiEventData.uEventDataSize = sizeof(*pwdiGtkOffloadReqMsg);
wdiEventData.pCBfnc = wdiGtkOffloadCb;
wdiEventData.pUserData = pUserData;
diff --git a/CORE/WDI/DP/src/wlan_qct_wdi_ds.c b/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
index 98d549b..29bdb9f 100644
--- a/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
+++ b/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
@@ -173,7 +173,7 @@
ucBdPoolType = WDI_MGMT_POOL_ID;
break;
default:
- return WDI_STATUS_E_FAILURE;;
+ return WDI_STATUS_E_FAILURE;
}
// Allocate BD header from pool