Use the normal type.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/bcm/CmHost.c | 22 ++++++++++----------
drivers/staging/bcm/HandleControlPacket.c | 2 +-
drivers/staging/bcm/IPv6Protocol.c | 6 ++--
drivers/staging/bcm/IPv6ProtocolHdr.h | 2 +-
drivers/staging/bcm/InterfaceIdleMode.h | 4 +-
drivers/staging/bcm/InterfaceIsr.h | 4 +-
drivers/staging/bcm/InterfaceMisc.c | 4 +-
drivers/staging/bcm/InterfaceMisc.h | 2 +-
drivers/staging/bcm/LeakyBucket.c | 6 ++--
drivers/staging/bcm/Misc.c | 24 ++++++++++----------
drivers/staging/bcm/Prototypes.h | 32 ++++++++++++++--------------
drivers/staging/bcm/Qos.c | 8 +++---
drivers/staging/bcm/Typedefs.h | 1 -
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 +-
17 files changed, 73 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index a46c118..4a25354 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -96,7 +96,7 @@ static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/
return MAX_CLASSIFIERS+1;
}
-static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
+static void deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
{
//deleting all the packet held in the SF
flush_queue(Adapter, uiSearchRuleIndex);
@@ -108,7 +108,7 @@ static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(S_MIBS_SERVICEFLOW_TABLE));
}
-static inline VOID
+static inline void
CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
B_UINT8 u8IpAddressLen , B_UINT8 *pu8IpAddressMaskSrc ,
BOOLEAN bIpVersion6 , E_IPADDR_CONTEXT eIpAddrContext)
@@ -259,10 +259,10 @@ void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
@ingroup ctrl_pkt_functions
copy classifier rule into the specified SF index
*/
-static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline void CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
{
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
- //VOID *pvPhsContext = NULL;
+ //void *pvPhsContext = NULL;
UINT ucLoopIndex=0;
//unsigned char ucProtocolLength=0;
//ULONG ulPhsStatus;
@@ -420,12 +420,12 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL
/**
@ingroup ctrl_pkt_functions
*/
-static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline void DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
{
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
B_UINT16 u16PacketClassificationRuleIndex;
unsigned short usVCID;
- //VOID *pvPhsContext = NULL;
+ //void *pvPhsContext = NULL;
//ULONG ulPhsStatus;
usVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
@@ -456,13 +456,13 @@ static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSear
/**
@ingroup ctrl_pkt_functions
*/
-VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
+void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
{
S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
UINT nClassifierIndex;
//B_UINT16 u16PacketClassificationRuleIndex;
unsigned short ulVCID;
- //VOID *pvPhsContext = NULL;
+ //void *pvPhsContext = NULL;
//ULONG ulPhsStatus;
ulVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
@@ -494,7 +494,7 @@ VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
@ingroup ctrl_pkt_functions
*/
-static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the Adapter structure*/
+static void CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the Adapter structure*/
register pstServiceFlowParamSI psfLocalSet, /**<Pointer to the ServiceFlowParamSI structure*/
register UINT uiSearchRuleIndex, /**<Index of Queue, to which this data belongs*/
register unsigned char ucDsxType,
@@ -948,7 +948,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A
*
* Returns - None
*************************************************************************/
-static VOID DumpCmControlPacket(PVOID pvBuffer)
+static void DumpCmControlPacket(PVOID pvBuffer)
{
UINT uiLoopIndex;
UINT nIndex;
@@ -2442,7 +2442,7 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __us
return STATUS_SUCCESS;
}
-VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer)
+void OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer)
{
B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
stIM_SFHostNotify *pHostInfo = NULL;
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index a8e41ff..44920d1 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(PMINI_ADAPTER Adapter, struct sk_buff *skb)
+static void handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
{
PPER_TARANG_DATA pTarang = NULL;
BOOLEAN HighPriorityMessage = FALSE;
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index c70c30b..545ca4d 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -2,7 +2,7 @@
static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Header *pstIpv6Header);
static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Header *pstIpv6Header);
-static VOID DumpIpv6Header(IPV6Header *pstIpv6Header);
+static void DumpIpv6Header(IPV6Header *pstIpv6Header);
static unsigned char * GetNextIPV6ChainedHeader(unsigned char **ppucPayload, unsigned char *pucNextHeader, BOOLEAN *bParseDone, unsigned short *pusPayloadLength)
{
@@ -352,7 +352,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6He
}
-VOID DumpIpv6Address(ULONG *puIpv6Address)
+void DumpIpv6Address(ULONG *puIpv6Address)
{
UINT uiIpv6AddrNoLongWords = 4;
UINT uiIpv6AddIndex=0;
@@ -364,7 +364,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
}
-static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
+static void DumpIpv6Header(IPV6Header *pstIpv6Header)
{
unsigned char ucVersion;
unsigned char ucPrio;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 9786722..2eef799 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -97,7 +97,7 @@ unsigned short IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver cont
PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
S_CLASSIFIER_RULE *pstClassifierRule );
-VOID DumpIpv6Address(ULONG *puIpv6Address);
+void DumpIpv6Address(ULONG *puIpv6Address);
extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort);
extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort);
diff --git a/drivers/staging/bcm/InterfaceIdleMode.h b/drivers/staging/bcm/InterfaceIdleMode.h
index 493a009..58ece9b 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
@@ -5,9 +5,9 @@ int InterfaceIdleModeWakeup(PMINI_ADAPTER Adapter);
int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int *puiBuffer);
-VOID InterfaceWriteIdleModeWakePattern(PMINI_ADAPTER Adapter);
+void InterfaceWriteIdleModeWakePattern(PMINI_ADAPTER Adapter);
int InterfaceWakeUp(PMINI_ADAPTER Adapter);
-VOID InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter);
+void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter);
#endif
diff --git a/drivers/staging/bcm/InterfaceIsr.h b/drivers/staging/bcm/InterfaceIsr.h
index 8c73c99..e32ccf0 100644
--- a/drivers/staging/bcm/InterfaceIsr.h
+++ b/drivers/staging/bcm/InterfaceIsr.h
@@ -7,8 +7,8 @@ int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter);
int StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter);
-VOID InterfaceEnableInterrupt(PMINI_ADAPTER Adapter);
+void InterfaceEnableInterrupt(PMINI_ADAPTER Adapter);
-VOID InterfaceDisableInterrupt(PMINI_ADAPTER Adapter);
+void InterfaceDisableInterrupt(PMINI_ADAPTER Adapter);
#endif
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 8093464..c262a76 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -188,7 +188,7 @@ int Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter)
return status;
}
-VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
+void Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
{
struct urb *tempUrb = NULL;
UINT i;
@@ -238,7 +238,7 @@ VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter)
atomic_set(&psIntfAdapter->uCurrRcb, 0);
}
-VOID putUsbSuspend(struct work_struct *work)
+void putUsbSuspend(struct work_struct *work)
{
PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
struct usb_interface *intf = NULL;
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 6c0d9b5..cfc7b20 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -35,7 +35,7 @@ int BcmWRM(PVOID arg,
int Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter);
-VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter);
+void Bcm_kill_all_URBs(PS_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 24e251f..08d5f31 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -15,7 +15,7 @@
* Returns - None
**********************************************************************/
-static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
+static void UpdateTokenCount(register PMINI_ADAPTER Adapter)
{
ULONG liCurrentTime;
int i = 0;
@@ -149,7 +149,7 @@ static int SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
* Returns - None.
*
****************************************************************************/
-static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
+static void CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
{
struct sk_buff *QueuePacket=NULL;
char *pControlPacket = NULL;
@@ -262,7 +262,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
*
* Returns - None.
********************************************************************/
-VOID transmit_packets(PMINI_ADAPTER Adapter)
+void transmit_packets(PMINI_ADAPTER Adapter)
{
UINT uiPrevTotalCount = 0;
int iIndex = 0;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index d18bcb1..0fca54a 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1,12 +1,12 @@
#include "headers.h"
static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path, unsigned int loc);
-static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter);
+static void doPowerAutoCorrection(PMINI_ADAPTER psAdapter);
static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, unsigned char *pucBuffer);
static int bcm_parse_target_params(PMINI_ADAPTER Adapter);
static void beceem_protocol_reset(PMINI_ADAPTER Adapter);
-static VOID default_wimax_protocol_initialize(PMINI_ADAPTER Adapter)
+static void default_wimax_protocol_initialize(PMINI_ADAPTER Adapter)
{
UINT uiLoopIndex;
@@ -101,7 +101,7 @@ int InitAdapter(PMINI_ADAPTER psAdapter)
return STATUS_SUCCESS;
}
-VOID AdapterFree(PMINI_ADAPTER Adapter)
+void AdapterFree(PMINI_ADAPTER Adapter)
{
int count;
beceem_protocol_reset(Adapter);
@@ -450,7 +450,7 @@ int CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
*
* Returns - None.
*****************************************************************/
-static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST pstStatisticsPtrRequest)
+static void SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST pstStatisticsPtrRequest)
{
bcm_dbg(Adapter, RX, RX_DPC, ALL, "======>\n");
pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS;
@@ -472,7 +472,7 @@ static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, PLINK_REQUEST ps
*
* Returns - None.
*******************************************************************/
-VOID LinkMessage(PMINI_ADAPTER Adapter)
+void LinkMessage(PMINI_ADAPTER Adapter)
{
PLINK_REQUEST pstLinkRequest = NULL;
bcm_dbg(Adapter, OTHERS, LINK_UP_MSG, ALL, "=====>\n");
@@ -528,7 +528,7 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
*
* Returns - None.
************************************************************************/
-VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
+void StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
{
bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s====>\n", __func__);
Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer);
@@ -548,7 +548,7 @@ VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
*
* Returns - None.
***********************************************************************/
-VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, unsigned char *pucBuffer)
+void LinkControlResponseMessage(PMINI_ADAPTER Adapter, unsigned char *pucBuffer)
{
bcm_dbg(Adapter, RX, RX_DPC, ALL, "=====>\n");
@@ -730,7 +730,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
*
* Returns - None.
*******************************************************************/
-VOID DumpPackInfo(PMINI_ADAPTER Adapter)
+void DumpPackInfo(PMINI_ADAPTER Adapter)
{
UINT uiLoopIndex = 0;
UINT uiIndex = 0;
@@ -1362,7 +1362,7 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
doPowerAutoCorrection(Adapter);
}
-static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
+static void doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
{
UINT reporting_mode;
@@ -1541,7 +1541,7 @@ exit:
return uiRetVal;
}
-static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
+static void HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
{
int clear_abort_pattern = 0, Status = 0;
bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "====>\n");
@@ -1573,7 +1573,7 @@ static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
bcm_dbg(Adapter, OTHERS, MP_SHUTDOWN, ALL, "<====\n");
}
-static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
+static void SendShutModeResponse(PMINI_ADAPTER Adapter)
{
CONTROL_MESSAGE stShutdownResponse;
UINT NVMAccess = 0, lowPwrAbortMsg = 0;
@@ -1691,7 +1691,7 @@ static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, unsigned char *pucB
return;
}
-VOID ResetCounters(PMINI_ADAPTER Adapter)
+void ResetCounters(PMINI_ADAPTER Adapter)
{
beceem_protocol_reset(Adapter);
Adapter->CurrNumRecvDescs = 0;
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 13f4e67..21e7afd 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(PMINI_ADAPTER Adapter, unsigned char *pucBuffer);
+void LinkControlResponseMessage(PMINI_ADAPTER Adapter, unsigned char *pucBuffer);
-VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer);
+void StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer);
-VOID IdleModeResponse(PMINI_ADAPTER Adapter, PUINT puiBuffer);
+void IdleModeResponse(PMINI_ADAPTER Adapter, PUINT puiBuffer);
int control_packet_handler (PMINI_ADAPTER Adapter);
-VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex);
+void DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex);
-VOID flush_all_queues(PMINI_ADAPTER Adapter);
+void flush_all_queues(PMINI_ADAPTER Adapter);
int register_control_device_interface(PMINI_ADAPTER ps_adapter);
@@ -21,13 +21,13 @@ int CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
PVOID ioBuffer/**<Control Packet Buffer*/
);
-VOID SortPackInfo(PMINI_ADAPTER Adapter);
+void SortPackInfo(PMINI_ADAPTER Adapter);
-VOID SortClassifiers(PMINI_ADAPTER Adapter);
+void SortClassifiers(PMINI_ADAPTER Adapter);
-VOID flush_all_queues(PMINI_ADAPTER Adapter);
+void flush_all_queues(PMINI_ADAPTER Adapter);
-VOID PruneQueueAllSF(PMINI_ADAPTER Adapter);
+void PruneQueueAllSF(PMINI_ADAPTER Adapter);
int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid);
@@ -42,9 +42,9 @@ int SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
struct sk_buff *Packet, /**<data buffer*/
unsigned short Vcid);
-VOID LinkMessage(PMINI_ADAPTER Adapter);
+void LinkMessage(PMINI_ADAPTER Adapter);
-VOID transmit_packets(PMINI_ADAPTER Adapter);
+void transmit_packets(PMINI_ADAPTER Adapter);
int SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
char *pControlPacket/**<Control Packet*/
@@ -56,7 +56,7 @@ void unregister_networkdev(PMINI_ADAPTER Adapter);
int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter);
-VOID AdapterFree(PMINI_ADAPTER Adapter);
+void AdapterFree(PMINI_ADAPTER Adapter);
int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter);
@@ -97,7 +97,7 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo);
void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,
CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
-VOID ResetCounters(PMINI_ADAPTER Adapter);
+void ResetCounters(PMINI_ADAPTER Adapter);
int InitLedSettings(PMINI_ADAPTER Adapter);
@@ -117,7 +117,7 @@ void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex);
-int flushAllAppQ(VOID);
+int flushAllAppQ(void);
int BeceemEEPROMBulkRead(
@@ -201,7 +201,7 @@ int BcmCopySection(PMINI_ADAPTER Adapter,
BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter);
-VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer);
+void OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer);
int wrmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
int rdmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
@@ -211,7 +211,7 @@ int buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned
unsigned long u32StartingAddress);
-VOID putUsbSuspend(struct work_struct *work);
+void putUsbSuspend(struct work_struct *work);
BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios);
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 5ebc5bb..c32652e 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -10,7 +10,7 @@ static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter, struct sk_buff* skb, PS_E
static unsigned short IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd,
S_CLASSIFIER_RULE *pstClassifierRule);
-static VOID PruneQueue(PMINI_ADAPTER Adapter, int iIndex);
+static void PruneQueue(PMINI_ADAPTER Adapter, int iIndex);
/*******************************************************************
@@ -306,7 +306,7 @@ static unsigned short IpVersion4(PMINI_ADAPTER Adapter,
return bClassificationSucceed;
}
-VOID PruneQueueAllSF(PMINI_ADAPTER Adapter)
+void PruneQueueAllSF(PMINI_ADAPTER Adapter)
{
UINT iIndex = 0;
@@ -326,7 +326,7 @@ VOID PruneQueueAllSF(PMINI_ADAPTER Adapter)
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(PMINI_ADAPTER Adapter, int iIndex)
+static void PruneQueue(PMINI_ADAPTER Adapter, int iIndex)
{
struct sk_buff* PacketToDrop=NULL;
struct net_device_stats *netstats;
@@ -395,7 +395,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, int iIndex)
bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL, "<=====\n");
}
-VOID flush_all_queues(PMINI_ADAPTER Adapter)
+void flush_all_queues(PMINI_ADAPTER Adapter)
{
int iQIndex;
UINT uiTotalPacketLength;
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index f4c12de..9b42291 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -11,7 +11,6 @@
typedef char BOOLEAN;
typedef long LONG;
-typedef void VOID;
typedef unsigned char B_UINT8;
typedef unsigned short B_UINT16;
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 6315f14..a97ec01 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -95,14 +95,14 @@ int ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMib
return STATUS_SUCCESS;
}
-VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, const PPER_TARANG_DATA pTarang)
+void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, const PPER_TARANG_DATA pTarang)
{
memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs),
&(pTarang->stDroppedAppCntrlMsgs),
sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
}
-VOID CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
+void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
{
S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 580a486..5f2a666 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -571,11 +571,11 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
* Arguments:
* Adapter - Pointer to MINI_ADAPTER structure.
*
- * Returns: VOID
+ * Returns: void
*
* -----------------------------------------------------------------------------
*/
-static VOID LedGpioInit(PMINI_ADAPTER Adapter)
+static void LedGpioInit(PMINI_ADAPTER Adapter)
{
UINT uiResetValue = 0;
UINT uiIndex = 0;
@@ -640,7 +640,7 @@ static int BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, unsigned char *GPIO_num_tx,
}
return STATUS_SUCCESS;
}
-static VOID LEDControlThread(PMINI_ADAPTER Adapter)
+static void LEDControlThread(PMINI_ADAPTER Adapter)
{
UINT uiIndex = 0;
unsigned char GPIO_num = 0;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 1b28a2d..6d32dee 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -9,7 +9,7 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter);
static int BcmGetFlashCSInfo(PMINI_ADAPTER Adapter);
static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize);
-static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter);
+static void BcmValidateNvmType(PMINI_ADAPTER Adapter);
static int BcmGetNvmSize(PMINI_ADAPTER Adapter);
static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter);
static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter);
@@ -945,11 +945,11 @@ static int flashWriteStatus(
// Adapter - ptr to Adapter object instance
// ulWriteStatus -Original status
// Returns:
-// <VOID>
+// <void>
//
//-----------------------------------------------------------------------------
-static VOID BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter, ULONG ulWriteStatus)
+static void BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter, ULONG ulWriteStatus)
{
UINT value;
value = (FLASH_CMD_WRITE_ENABLE<< 24);
@@ -1653,7 +1653,7 @@ static int BeceemEEPROMReadBackandVerify(
return 0;
}
-static VOID BcmSwapWord(UINT *ptr1) {
+static void BcmSwapWord(UINT *ptr1) {
UINT tempval = (UINT)*ptr1;
char *ptr2 = (char *)&tempval;
@@ -2291,9 +2291,9 @@ static int BcmGetNvmSize(PMINI_ADAPTER Adapter)
// Adapter - ptr to Adapter object instance
//
// Returns:
-// <VOID>
+// <void>
//-----------------------------------------------------------------------------
-static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter)
+static void BcmValidateNvmType(PMINI_ADAPTER Adapter)
{
//
@@ -2618,7 +2618,7 @@ static int IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL
(Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS) );
}
-static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
+static void UpdateVendorInfo(PMINI_ADAPTER Adapter)
{
B_UINT32 i = 0;
UINT uiSizeSection = 0;
@@ -2703,7 +2703,7 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
// Adapter - ptr to Adapter object instance
//
// Returns:
-// <VOID>
+// <void>
//-----------------------------------------------------------------------------
static int BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
diff --git a/drivers/staging/bcm/sort.c b/drivers/staging/bcm/sort.c
index b791b0b..171f2d0 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(PMINI_ADAPTER Adapter)
+void SortPackInfo(PMINI_ADAPTER Adapter)
{
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=======\n");
@@ -41,7 +41,7 @@ static int compare_classifiers(void const *a, void const *b)
return pa->u8ClassifierRulePriority - pb->u8ClassifierRulePriority;
}
-VOID SortClassifiers(PMINI_ADAPTER Adapter)
+void SortClassifiers(PMINI_ADAPTER Adapter)
{
bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "<=======\n");
--
1.7.8.111.gad25c.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
