Replace user-defined data type LONG with C defined data type
long.
Signed-off-by: Lisa Nguyen <lisa@xxxxxxxxxxxxxxx>
---
drivers/staging/bcm/CmHost.c | 22 ++++++++++-----------
drivers/staging/bcm/HandleControlPacket.c | 2 +-
drivers/staging/bcm/IPv6Protocol.c | 6 +++---
drivers/staging/bcm/InterfaceIdleMode.h | 4 ++--
drivers/staging/bcm/InterfaceIsr.h | 4 ++--
drivers/staging/bcm/InterfaceMisc.h | 2 +-
drivers/staging/bcm/LeakyBucket.c | 6 +++---
drivers/staging/bcm/PHSModule.c | 2 +-
drivers/staging/bcm/Prototypes.h | 32 +++++++++++++++----------------
drivers/staging/bcm/Qos.c | 8 ++++----
drivers/staging/bcm/Typedefs.h | 3 ---
drivers/staging/bcm/hostmibs.c | 4 ++--
drivers/staging/bcm/led_control.c | 6 +++---
drivers/staging/bcm/nvm.c | 16 ++++++++--------
drivers/staging/bcm/sort.c | 4 ++--
15 files changed, 59 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index d2bb898..97b0f52 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -98,7 +98,7 @@ static int SearchFreeClsid(struct bcm_mini_adapter *Adapter /**Adapter Context*/
return MAX_CLASSIFIERS+1;
}
-static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)
+static void deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)
{
/* deleting all the packet held in the SF */
flush_queue(Adapter, uiSearchRuleIndex);
@@ -110,7 +110,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn
memset((void *)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(struct bcm_mibs_table));
}
-static inline VOID
+static inline void
CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc,
bool bIpVersion6, enum bcm_ipaddr_context eIpAddrContext)
@@ -235,10 +235,10 @@ void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, bool b
* @ingroup ctrl_pkt_functions
* copy classifier rule into the specified SF index
*/
-static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, struct bcm_convergence_types *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline void CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, struct bcm_convergence_types *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
{
struct bcm_classifier_rule *pstClassifierEntry = NULL;
- /* VOID *pvPhsContext = NULL; */
+ /* void *pvPhsContext = NULL; */
int i;
/* UCHAR ucProtocolLength=0; */
/* ULONG ulPhsStatus; */
@@ -364,12 +364,12 @@ static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stru
/*
* @ingroup ctrl_pkt_functions
*/
-static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline void DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
{
struct bcm_classifier_rule *pstClassifierEntry = NULL;
B_UINT16 u16PacketClassificationRuleIndex;
USHORT usVCID;
- /* VOID *pvPhsContext = NULL; */
+ /* void *pvPhsContext = NULL; */
/*ULONG ulPhsStatus; */
usVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
@@ -395,13 +395,13 @@ static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter,
/*
* @ingroup ctrl_pkt_functions
*/
-VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)
+void DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)
{
struct bcm_classifier_rule *pstClassifierEntry = NULL;
int i;
/* B_UINT16 u16PacketClassificationRuleIndex; */
USHORT ulVCID;
- /* VOID *pvPhsContext = NULL; */
+ /* void *pvPhsContext = NULL; */
/* ULONG ulPhsStatus; */
ulVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
@@ -427,7 +427,7 @@ VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRu
* related data into the Adapter structure.
* @ingroup ctrl_pkt_functions
*/
-static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
+static void CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
register struct bcm_connect_mgr_params *psfLocalSet, /* Pointer to the connection manager parameters structure */
register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
register UCHAR ucDsxType,
@@ -829,7 +829,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer
*
* Returns - None
*************************************************************************/
-static VOID DumpCmControlPacket(void *pvBuffer)
+static void DumpCmControlPacket(void *pvBuffer)
{
int uiLoopIndex;
int nIndex;
@@ -1910,7 +1910,7 @@ int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId
return STATUS_SUCCESS;
}
-VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer)
+void OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer)
{
B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
struct bcm_stim_sfhostnotify *pHostInfo = NULL;
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 617f725..c94c25e 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -11,7 +11,7 @@
* Enqueue the control packet for Application.
* @return None
*/
-static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb)
+static void handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb)
{
struct bcm_tarang_data *pTarang = NULL;
bool HighPriorityMessage = false;
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index f569314..cce6cbc 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -4,7 +4,7 @@ static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
struct bcm_ipv6_hdr *pstIpv6Header);
static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
struct bcm_ipv6_hdr *pstIpv6Header);
-static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header);
+static void DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header);
static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
UCHAR *pucNextHeader, bool *bParseDone, USHORT *pusPayloadLength)
@@ -402,7 +402,7 @@ static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
}
-VOID DumpIpv6Address(ULONG *puIpv6Address)
+void DumpIpv6Address(ULONG *puIpv6Address)
{
UINT uiIpv6AddrNoLongWords = 4;
UINT uiIpv6AddIndex = 0;
@@ -414,7 +414,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
}
-static VOID DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header)
+static void DumpIpv6Header(struct bcm_ipv6_hdr *pstIpv6Header)
{
UCHAR ucVersion;
UCHAR ucPrio;
diff --git a/drivers/staging/bcm/InterfaceIdleMode.h b/drivers/staging/bcm/InterfaceIdleMode.h
index 642a23c..3a5acd7 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
@@ -6,10 +6,10 @@ int InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter);
int InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter,
unsigned int *puiBuffer);
-VOID InterfaceWriteIdleModeWakePattern(struct bcm_mini_adapter *Adapter);
+void InterfaceWriteIdleModeWakePattern(struct bcm_mini_adapter *Adapter);
int InterfaceWakeUp(struct bcm_mini_adapter *Adapter);
-VOID InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter);
+void InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter);
#endif
diff --git a/drivers/staging/bcm/InterfaceIsr.h b/drivers/staging/bcm/InterfaceIsr.h
index f62b3bf..ba3dbf3 100644
--- a/drivers/staging/bcm/InterfaceIsr.h
+++ b/drivers/staging/bcm/InterfaceIsr.h
@@ -7,9 +7,9 @@ int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
int StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
-VOID InterfaceEnableInterrupt(struct bcm_mini_adapter *Adapter);
+void InterfaceEnableInterrupt(struct bcm_mini_adapter *Adapter);
-VOID InterfaceDisableInterrupt(struct bcm_mini_adapter *Adapter);
+void InterfaceDisableInterrupt(struct bcm_mini_adapter *Adapter);
#endif
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 161300c..9f7eb8d 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -33,7 +33,7 @@ int BcmWRM(void *arg,
int Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter);
-VOID Bcm_kill_all_URBs(struct bcm_interface_adapter *psIntfAdapter);
+void Bcm_kill_all_URBs(struct bcm_interface_adapter *psIntfAdapter);
#define DISABLE_USB_ZERO_LEN_INT 0x0F011878
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index 93169e8..775566e 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -15,7 +15,7 @@
* Returns - None
**********************************************************************/
-static VOID UpdateTokenCount(register struct bcm_mini_adapter *Adapter)
+static void UpdateTokenCount(register struct bcm_mini_adapter *Adapter)
{
ULONG liCurrentTime;
int i = 0;
@@ -142,7 +142,7 @@ static int SendPacketFromQueue(struct bcm_mini_adapter *Adapter,/**<Logical Adap
* Returns - None.
*
****************************************************************************/
-static VOID CheckAndSendPacketFromIndex(struct bcm_mini_adapter *Adapter, struct bcm_packet_info *psSF)
+static void CheckAndSendPacketFromIndex(struct bcm_mini_adapter *Adapter, struct bcm_packet_info *psSF)
{
struct sk_buff *QueuePacket = NULL;
char *pControlPacket = NULL;
@@ -245,7 +245,7 @@ static VOID CheckAndSendPacketFromIndex(struct bcm_mini_adapter *Adapter, struct
*
* Returns - None.
********************************************************************/
-VOID transmit_packets(struct bcm_mini_adapter *Adapter)
+void transmit_packets(struct bcm_mini_adapter *Adapter)
{
UINT uiPrevTotalCount = 0;
int iIndex = 0;
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 68f613b..75a831f 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -82,7 +82,7 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
UINT usPacketType;
UINT BytesToRemove = 0;
bool bPHSI = 0;
- LONG ulPhsStatus = 0;
+ long ulPhsStatus = 0;
UINT numBytesCompressed = 0;
struct sk_buff *newPacket = NULL;
struct sk_buff *Packet = *pPacket;
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 8e052cd..a441e68 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -1,17 +1,17 @@
#ifndef _PROTOTYPES_H_
#define _PROTOTYPES_H_
-VOID LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer);
+void LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer);
-VOID StatisticsResponse(struct bcm_mini_adapter *Adapter, void *pvBuffer);
+void StatisticsResponse(struct bcm_mini_adapter *Adapter, void *pvBuffer);
-VOID IdleModeResponse(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
+void IdleModeResponse(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
int control_packet_handler (struct bcm_mini_adapter *Adapter);
-VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter,UINT uiSearchRuleIndex);
+void DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter,UINT uiSearchRuleIndex);
-VOID flush_all_queues(struct bcm_mini_adapter *Adapter);
+void flush_all_queues(struct bcm_mini_adapter *Adapter);
int register_control_device_interface(struct bcm_mini_adapter *ps_adapter);
@@ -21,13 +21,13 @@ int CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter,/**<Logical Adapt
void *ioBuffer/**<Control Packet Buffer*/
);
-VOID SortPackInfo(struct bcm_mini_adapter *Adapter);
+void SortPackInfo(struct bcm_mini_adapter *Adapter);
-VOID SortClassifiers(struct bcm_mini_adapter *Adapter);
+void SortClassifiers(struct bcm_mini_adapter *Adapter);
-VOID flush_all_queues(struct bcm_mini_adapter *Adapter);
+void flush_all_queues(struct bcm_mini_adapter *Adapter);
-VOID PruneQueueAllSF(struct bcm_mini_adapter *Adapter);
+void PruneQueueAllSF(struct bcm_mini_adapter *Adapter);
int SearchSfid(struct bcm_mini_adapter *Adapter,UINT uiSfid);
@@ -42,9 +42,9 @@ int SetupNextSend(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
struct sk_buff *Packet, /**<data buffer*/
USHORT Vcid) ;
-VOID LinkMessage(struct bcm_mini_adapter *Adapter);
+void LinkMessage(struct bcm_mini_adapter *Adapter);
-VOID transmit_packets(struct bcm_mini_adapter *Adapter);
+void transmit_packets(struct bcm_mini_adapter *Adapter);
int SendControlPacket(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
char *pControlPacket/**<Control Packet*/
@@ -56,7 +56,7 @@ void unregister_networkdev(struct bcm_mini_adapter *Adapter);
int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
-VOID AdapterFree(struct bcm_mini_adapter *Adapter);
+void AdapterFree(struct bcm_mini_adapter *Adapter);
int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
@@ -97,7 +97,7 @@ int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_
void CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter,
struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex);
-VOID ResetCounters(struct bcm_mini_adapter *Adapter);
+void ResetCounters(struct bcm_mini_adapter *Adapter);
int InitLedSettings(struct bcm_mini_adapter *Adapter);
@@ -117,7 +117,7 @@ void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter,B_UINT16 TID,bool bFr
void flush_queue(struct bcm_mini_adapter *Adapter, UINT iQIndex);
-int flushAllAppQ(VOID);
+int flushAllAppQ(void);
int BeceemEEPROMBulkRead(
@@ -201,7 +201,7 @@ int BcmCopySection(struct bcm_mini_adapter *Adapter,
bool IsNonCDLessDevice(struct bcm_mini_adapter *Adapter);
-VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
+void OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
int wrmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
int rdmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
@@ -211,7 +211,7 @@ int buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer
unsigned long u32StartingAddress);
-VOID putUsbSuspend(struct work_struct *work);
+void putUsbSuspend(struct work_struct *work);
bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios);
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index ecab00b..5048034 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -10,7 +10,7 @@ static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* s
static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd,
struct bcm_classifier_rule *pstClassifierRule);
-static VOID PruneQueue(struct bcm_mini_adapter *Adapter, int iIndex);
+static void PruneQueue(struct bcm_mini_adapter *Adapter, int iIndex);
/*******************************************************************
@@ -302,7 +302,7 @@ static USHORT IpVersion4(struct bcm_mini_adapter *Adapter,
return bClassificationSucceed;
}
-VOID PruneQueueAllSF(struct bcm_mini_adapter *Adapter)
+void PruneQueueAllSF(struct bcm_mini_adapter *Adapter)
{
UINT iIndex = 0;
@@ -323,7 +323,7 @@ is less than number of bytes in the queue. If so -
drops packets from the Head till the number of bytes is
less than or equal to max queue size for the queue.
*/
-static VOID PruneQueue(struct bcm_mini_adapter *Adapter, int iIndex)
+static void PruneQueue(struct bcm_mini_adapter *Adapter, int iIndex)
{
struct sk_buff* PacketToDrop = NULL;
struct net_device_stats *netstats;
@@ -392,7 +392,7 @@ static VOID PruneQueue(struct bcm_mini_adapter *Adapter, int iIndex)
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "<=====");
}
-VOID flush_all_queues(struct bcm_mini_adapter *Adapter)
+void flush_all_queues(struct bcm_mini_adapter *Adapter)
{
int iQIndex;
UINT uiTotalPacketLength;
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index 5d2b32e..c2085cf 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -6,9 +6,6 @@
#define STATUS_SUCCESS 0
#define STATUS_FAILURE -1
-typedef long LONG;
-typedef void VOID;
-
typedef unsigned char UCHAR;
typedef unsigned char B_UINT8;
typedef unsigned short USHORT;
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 11a7ea7..3cef1ca 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -94,14 +94,14 @@ int ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m
return STATUS_SUCCESS;
}
-VOID GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct bcm_tarang_data *pTarang)
+void GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct bcm_tarang_data *pTarang)
{
memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs),
&(pTarang->stDroppedAppCntrlMsgs),
sizeof(struct bcm_mibs_dropped_cntrl_msg));
}
-VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
+void CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
{
struct bcm_mibs_parameters *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 48fd571..23a1c8d 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -576,11 +576,11 @@ static int ReadConfigFileStructure(struct bcm_mini_adapter *Adapter,
* Arguments:
* Adapter - Pointer to MINI_ADAPTER structure.
*
- * Returns: VOID
+ * Returns: void
*
* -----------------------------------------------------------------------------
*/
-static VOID LedGpioInit(struct bcm_mini_adapter *Adapter)
+static void LedGpioInit(struct bcm_mini_adapter *Adapter)
{
UINT uiResetValue = 0;
UINT uiIndex = 0;
@@ -645,7 +645,7 @@ static int BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_t
}
return STATUS_SUCCESS;
}
-static VOID LEDControlThread(struct bcm_mini_adapter *Adapter)
+static void LEDControlThread(struct bcm_mini_adapter *Adapter)
{
UINT uiIndex = 0;
UCHAR GPIO_num = 0;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 3e85817..bb81afc 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -9,7 +9,7 @@ static unsigned int BcmGetEEPROMSize(struct bcm_mini_adapter *Adapter);
static int BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter);
static unsigned int BcmGetFlashSectorSize(struct bcm_mini_adapter *Adapter, unsigned int FlashSectorSizeSig, unsigned int FlashSectorSize);
-static VOID BcmValidateNvmType(struct bcm_mini_adapter *Adapter);
+static void BcmValidateNvmType(struct bcm_mini_adapter *Adapter);
static int BcmGetNvmSize(struct bcm_mini_adapter *Adapter);
static unsigned int BcmGetFlashSize(struct bcm_mini_adapter *Adapter);
static enum bcm_nvm_type BcmGetNvmType(struct bcm_mini_adapter *Adapter);
@@ -907,11 +907,11 @@ static int flashWriteStatus(struct bcm_mini_adapter *Adapter,
* Adapter - ptr to Adapter object instance
* ulWriteStatus -Original status
* Returns:
- * <VOID>
+ * <void>
*
*/
-static VOID BcmRestoreBlockProtectStatus(struct bcm_mini_adapter *Adapter, ULONG ulWriteStatus)
+static void BcmRestoreBlockProtectStatus(struct bcm_mini_adapter *Adapter, ULONG ulWriteStatus)
{
unsigned int value;
value = (FLASH_CMD_WRITE_ENABLE << 24);
@@ -1564,7 +1564,7 @@ static int BeceemEEPROMReadBackandVerify(struct bcm_mini_adapter *Adapter,
return 0;
}
-static VOID BcmSwapWord(unsigned int *ptr1)
+static void BcmSwapWord(unsigned int *ptr1)
{
unsigned int tempval = (unsigned int)*ptr1;
char *ptr2 = (char *)&tempval;
@@ -2171,10 +2171,10 @@ static int BcmGetNvmSize(struct bcm_mini_adapter *Adapter)
* Adapter - ptr to Adapter object instance
*
* Returns:
- * <VOID>
+ * <void>
*/
-static VOID BcmValidateNvmType(struct bcm_mini_adapter *Adapter)
+static void BcmValidateNvmType(struct bcm_mini_adapter *Adapter)
{
/*
* if forcing the FLASH through CFG file, we should ensure device really has a FLASH.
@@ -2420,7 +2420,7 @@ static int IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, enum bcm
(Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS));
}
-static VOID UpdateVendorInfo(struct bcm_mini_adapter *Adapter)
+static void UpdateVendorInfo(struct bcm_mini_adapter *Adapter)
{
B_UINT32 i = 0;
unsigned int uiSizeSection = 0;
@@ -2504,7 +2504,7 @@ static VOID UpdateVendorInfo(struct bcm_mini_adapter *Adapter)
* Adapter - ptr to Adapter object instance
*
* Returns:
- * <VOID>
+ * <void>
*/
static int BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter)
diff --git a/drivers/staging/bcm/sort.c b/drivers/staging/bcm/sort.c
index d518c42..2067dcc 100644
--- a/drivers/staging/bcm/sort.c
+++ b/drivers/staging/bcm/sort.c
@@ -22,7 +22,7 @@ static int compare_packet_info(void const *a, void const *b)
return pa->u8TrafficPriority - pb->u8TrafficPriority;
}
-VOID SortPackInfo(struct bcm_mini_adapter *Adapter)
+void SortPackInfo(struct bcm_mini_adapter *Adapter)
{
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
DBG_LVL_ALL, "<=======");
@@ -42,7 +42,7 @@ static int compare_classifiers(void const *a, void const *b)
return pa->u8ClassifierRulePriority - pb->u8ClassifierRulePriority;
}
-VOID SortClassifiers(struct bcm_mini_adapter *Adapter)
+void SortClassifiers(struct bcm_mini_adapter *Adapter)
{
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
DBG_LVL_ALL, "<=======");
--
1.8.1.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
