Use the normal types. Remove unnecessary casts.
Signed-off-by: Joe Perches <[email protected]> --- drivers/staging/bcm/Adapter.h | 24 ++++++++++++------------ drivers/staging/bcm/Bcmchar.c | 6 +++--- drivers/staging/bcm/CmHost.c | 16 ++++++++-------- drivers/staging/bcm/CmHost.h | 4 ++-- drivers/staging/bcm/HandleControlPacket.c | 2 +- drivers/staging/bcm/IPv6Protocol.c | 2 +- drivers/staging/bcm/IPv6ProtocolHdr.h | 2 +- drivers/staging/bcm/InterfaceAdapter.h | 4 ++-- drivers/staging/bcm/InterfaceDld.c | 4 ++-- drivers/staging/bcm/InterfaceMisc.c | 12 ++++++------ drivers/staging/bcm/InterfaceMisc.h | 16 ++++++++-------- drivers/staging/bcm/InterfaceTx.c | 4 ++-- drivers/staging/bcm/InterfaceTx.h | 2 +- drivers/staging/bcm/Misc.c | 4 ++-- drivers/staging/bcm/Prototypes.h | 4 ++-- drivers/staging/bcm/Qos.c | 6 +++--- drivers/staging/bcm/Typedefs.h | 1 - drivers/staging/bcm/hostmibs.c | 10 ++++------ drivers/staging/bcm/nvm.c | 8 ++++---- drivers/staging/bcm/vendorspecificextn.c | 8 ++++---- drivers/staging/bcm/vendorspecificextn.h | 8 ++++---- 21 files changed, 72 insertions(+), 75 deletions(-) diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index e80475d..30603fe 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h @@ -20,8 +20,8 @@ typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND; struct _CONTROL_PACKET { - PVOID ControlBuff; - UINT ControlBuffLen; + void *ControlBuff; + UINT ControlBuffLen; struct _CONTROL_PACKET* next; }__attribute__((packed)); typedef struct _CONTROL_PACKET CONTROL_PACKET,*PCONTROL_PACKET; @@ -347,9 +347,9 @@ typedef struct _STTARGETDSXBUFFER { BOOLEAN valid; }STTARGETDSXBUFFER, *PSTTARGETDSXBUFFER; -typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*, UINT, PVOID); +typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER*, UINT, void *); -typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER*, UINT, PVOID); +typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER*, UINT, void *); /** Driver adapter data structure @@ -456,22 +456,22 @@ struct _MINI_ADAPTER { /* Driver State for LED Blinking */ LedEventInfo_t DriverState; /* Interface Specific */ - PVOID pvInterfaceAdapter; - int (*bcm_file_download)( PVOID, + void *pvInterfaceAdapter; + int (*bcm_file_download)( void *, struct file *, unsigned int); - int (*bcm_file_readback_from_chip)( PVOID, + int (*bcm_file_readback_from_chip)( void *, struct file *, unsigned int); - int (*interface_rdm)(PVOID, + int (*interface_rdm)(void *, UINT , - PVOID , + void *, int); - int (*interface_wrm)(PVOID, + int (*interface_wrm)(void *, UINT , - PVOID , + void *, int); - int (*interface_transmit)(PVOID, PVOID , UINT); + int (*interface_transmit)(void *, void *, UINT); BOOLEAN IdleMode; BOOLEAN bDregRequestSentInIdleMode; BOOLEAN bTriedToWakeUpFromlowPowerMode; diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index b6ffe2d..d5d3da1 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -730,7 +730,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) case IOCTL_SS_INFO_REQ: case IOCTL_SEND_CONTROL_MESSAGE: case IOCTL_IDLE_REQ: { - PVOID pvBuffer = NULL; + void *pvBuffer = NULL; /* Copy Ioctl Buffer structure */ if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) @@ -764,7 +764,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) Status = STATUS_FAILURE; goto cntrlEnd; } - Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer); + Status = CopyBufferToControlPacket(Adapter, (void *)pvBuffer); cntrlEnd: up(&Adapter->LowPowerModeSync); @@ -1095,7 +1095,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) break; case IOCTL_BCM_GET_HOST_MIBS: { - PVOID temp_buff; + void *temp_buff; if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) return -EFAULT; diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 4a25354..a37ef33 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -105,7 +105,7 @@ static void deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex) DeleteAllClassifiersForSF(Adapter, uiSearchRuleIndex); //Resetting only MIBS related entries in the SF - memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(S_MIBS_SERVICEFLOW_TABLE)); + memset(&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(S_MIBS_SERVICEFLOW_TABLE)); } static inline void @@ -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(void *pvBuffer) { UINT uiLoopIndex; UINT nIndex; @@ -1810,7 +1810,7 @@ static ULONG StoreSFParam(PMINI_ADAPTER Adapter, unsigned char *pucSrcBuffer, UL return 1; } -ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT *puBufferLength) +ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer, UINT *puBufferLength) { stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL; stLocalSFAddIndication * pstAddIndication = NULL; @@ -1916,7 +1916,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT static inline stLocalSFAddIndicationAlt -*RestoreCmControlResponseMessage(register PMINI_ADAPTER Adapter, register PVOID pvBuffer) +*RestoreCmControlResponseMessage(register PMINI_ADAPTER Adapter, register void *pvBuffer) { ULONG ulStatus=0; stLocalSFAddIndication *pstAddIndication = NULL; @@ -2145,7 +2145,7 @@ int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter) @return - Queue index for the free SFID else returns Invalid Index. */ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adapter structure*/ - PVOID pvBuffer /**Starting Address of the Buffer, that contains the AddIndication Data*/ + void *pvBuffer /**Starting Address of the Buffer, that contains the AddIndication Data*/ ) { stServiceFlowParamSI *psfLocalSet=NULL; @@ -2186,7 +2186,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "VCID = %x\n", ntohs(pstAddIndication->u16VCID)); - CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); + CopyBufferToControlPacket(Adapter, (void *)Adapter->caDsxReqResp); kfree(pstAddIndication); } break; @@ -2308,7 +2308,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap *((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication; ((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP; - CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); + CopyBufferToControlPacket(Adapter, (void *)Adapter->caDsxReqResp); kfree(pstAddIndication); } break; @@ -2402,7 +2402,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "SENDING DSD RESPONSE TO MAC\n"); ((stLocalSFDeleteIndication*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP; - CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); + CopyBufferToControlPacket(Adapter, (void *)Adapter->caDsxReqResp); } case DSD_RSP: { //Do nothing as SF has already got Deleted diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h index b523041..99a06ec 100644 --- a/drivers/staging/bcm/CmHost.h +++ b/drivers/staging/bcm/CmHost.h @@ -148,14 +148,14 @@ typedef struct stLocalSFChangeIndicationAlt{ }stLocalSFChangeIndicationAlt; -ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT *puBufferLength); +ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer, UINT *puBufferLength); int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter); int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter); ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter); -BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer); +BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffer); #pragma pack (pop) diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c index 44920d1..c1ef0cf 100644 --- a/drivers/staging/bcm/HandleControlPacket.c +++ b/drivers/staging/bcm/HandleControlPacket.c @@ -222,7 +222,7 @@ int flushAllAppQ(void) } pTarang->AppCtrlQueueLen = 0; /* dropped contrl packet statistics also should be reset. */ - memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0, + memset(&pTarang->stDroppedAppCntrlMsgs, 0, sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES)); } diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c index 545ca4d..decd53d 100644 --- a/drivers/staging/bcm/IPv6Protocol.c +++ b/drivers/staging/bcm/IPv6Protocol.c @@ -159,7 +159,7 @@ static unsigned char GetIpv6ProtocolPorts(unsigned char *pucPayload, unsigned sh unsigned short IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */ - PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/ + void *pcIpHeader, /**<Pointer to the IP Hdr of the packet*/ S_CLASSIFIER_RULE *pstClassifierRule ) { unsigned short ushDestPort = 0; diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h index 2eef799..d781b29 100644 --- a/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/drivers/staging/bcm/IPv6ProtocolHdr.h @@ -94,7 +94,7 @@ typedef enum _E_IPADDR_CONTEXT //Function Prototypes unsigned short IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */ - PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/ + void *pcIpHeader, /**<Pointer to the IP Hdr of the packet*/ S_CLASSIFIER_RULE *pstClassifierRule ); void DumpIpv6Address(ULONG *puIpv6Address); diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h index 4c4ad4a..cc1d0c0 100644 --- a/drivers/staging/bcm/InterfaceAdapter.h +++ b/drivers/staging/bcm/InterfaceAdapter.h @@ -37,14 +37,14 @@ typedef struct _INTR_ENDP_OUT { typedef struct _USB_TCB { struct urb *urb; - PVOID psIntfAdapter; + void *psIntfAdapter; BOOLEAN bUsed; }USB_TCB, *PUSB_TCB; typedef struct _USB_RCB { struct urb *urb; - PVOID psIntfAdapter; + void *psIntfAdapter; BOOLEAN bUsed; }USB_RCB, *PUSB_RCB; diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c index 06218ab..f23bc0f 100644 --- a/drivers/staging/bcm/InterfaceDld.c +++ b/drivers/staging/bcm/InterfaceDld.c @@ -1,6 +1,6 @@ #include "headers.h" -int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc) +int InterfaceFileDownload(void *arg, struct file *flp, unsigned int on_chip_loc) { /* unsigned int reg = 0; */ mm_segment_t oldfs = {0}; @@ -49,7 +49,7 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc) return errno; } -int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_chip_loc) +int InterfaceFileReadbackFromChip(void *arg, struct file *flp, unsigned int on_chip_loc) { char *buff, *buff_readback; unsigned int reg = 0; diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c index c262a76..1bfd597 100644 --- a/drivers/staging/bcm/InterfaceMisc.c +++ b/drivers/staging/bcm/InterfaceMisc.c @@ -2,7 +2,7 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter, UINT addr, - PVOID buff, + void *buff, int len) { int bytes; @@ -64,7 +64,7 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter, int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter, UINT addr, - PVOID buff, + void *buff, int len) { int retval = 0; @@ -127,17 +127,17 @@ int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter, } } -int BcmRDM(PVOID arg, +int BcmRDM(void *arg, UINT addr, - PVOID buff, + void *buff, int len) { return InterfaceRDM((PS_INTERFACE_ADAPTER)arg, addr, buff, len); } -int BcmWRM(PVOID arg, +int BcmWRM(void *arg, UINT addr, - PVOID buff, + void *buff, int len) { return InterfaceWRM((PS_INTERFACE_ADAPTER)arg, addr, buff, len); diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h index cfc7b20..29ae8c3 100644 --- a/drivers/staging/bcm/InterfaceMisc.h +++ b/drivers/staging/bcm/InterfaceMisc.h @@ -4,33 +4,33 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter, UINT addr, - PVOID buff, + void *buff, int len); int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter, UINT addr, - PVOID buff, + void *buff, int len); -int InterfaceFileDownload( PVOID psIntfAdapter, +int InterfaceFileDownload( void *psIntfAdapter, struct file *flp, unsigned int on_chip_loc); -int InterfaceFileReadbackFromChip( PVOID psIntfAdapter, +int InterfaceFileReadbackFromChip( void *psIntfAdapter, struct file *flp, unsigned int on_chip_loc); -int BcmRDM(PVOID arg, +int BcmRDM(void *arg, UINT addr, - PVOID buff, + void *buff, int len); -int BcmWRM(PVOID arg, +int BcmWRM(void *arg, UINT addr, - PVOID buff, + void *buff, int len); int Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter); diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c index 194682f..b1f5f70 100644 --- a/drivers/staging/bcm/InterfaceTx.c +++ b/drivers/staging/bcm/InterfaceTx.c @@ -123,7 +123,7 @@ static PUSB_TCB GetBulkOutTcb(PS_INTERFACE_ADAPTER psIntfAdapter) return pTcb; } -static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID data, int len) +static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, void *data, int len) { struct urb *urb = pTcb->urb; @@ -171,7 +171,7 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, PVOID return retval; } -int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len) +int InterfaceTransmitPacket(void *arg, void *data, UINT len) { PUSB_TCB pTcb= NULL; diff --git a/drivers/staging/bcm/InterfaceTx.h b/drivers/staging/bcm/InterfaceTx.h index 50c6a90..8a6b4f1 100644 --- a/drivers/staging/bcm/InterfaceTx.h +++ b/drivers/staging/bcm/InterfaceTx.h @@ -1,6 +1,6 @@ #ifndef _INTERFACE_TX_H #define _INTERFACE_TX_H -int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len); +int InterfaceTransmitPacket(void *arg, void *data, UINT len); #endif diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c index 0fca54a..d543eaf 100644 --- a/drivers/staging/bcm/Misc.c +++ b/drivers/staging/bcm/Misc.c @@ -248,7 +248,7 @@ exit_download: * Logical Adapter * Control Packet Buffer */ -int CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer) +int CopyBufferToControlPacket(PMINI_ADAPTER Adapter, void *ioBuffer) { PLEADER pLeader = NULL; int Status = 0; @@ -528,7 +528,7 @@ void LinkMessage(PMINI_ADAPTER Adapter) * * Returns - None. ************************************************************************/ -void StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer) +void StatisticsResponse(PMINI_ADAPTER Adapter, void *pvBuffer) { bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%s====>\n", __func__); Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer); diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h index 21e7afd..cac016f 100644 --- a/drivers/staging/bcm/Prototypes.h +++ b/drivers/staging/bcm/Prototypes.h @@ -3,7 +3,7 @@ void LinkControlResponseMessage(PMINI_ADAPTER Adapter, unsigned char *pucBuffer); -void StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer); +void StatisticsResponse(PMINI_ADAPTER Adapter, void *pvBuffer); void IdleModeResponse(PMINI_ADAPTER Adapter, PUINT puiBuffer); @@ -18,7 +18,7 @@ int register_control_device_interface(PMINI_ADAPTER ps_adapter); void unregister_control_device_interface(PMINI_ADAPTER Adapter); int CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/ - PVOID ioBuffer/**<Control Packet Buffer*/ + void *ioBuffer/**<Control Packet Buffer*/ ); void SortPackInfo(PMINI_ADAPTER Adapter); diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index c32652e..e30a875 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -4,7 +4,7 @@ */ #include "headers.h" -static void EThCSGetPktInfo(PMINI_ADAPTER Adapter, PVOID pvEthPayload, PS_ETHCS_PKT_INFO pstEthCsPktInfo); +static void EThCSGetPktInfo(PMINI_ADAPTER Adapter, void *pvEthPayload, PS_ETHCS_PKT_INFO pstEthCsPktInfo); static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter, struct sk_buff* skb, PS_ETHCS_PKT_INFO pstEthCsPktInfo, S_CLASSIFIER_RULE *pstClassifierRule, B_UINT8 EthCSCupport); static unsigned short IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd, @@ -447,7 +447,7 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb) int uiLoopIndex = 0; S_CLASSIFIER_RULE *pstClassifierRule = NULL; S_ETHCS_PKT_INFO stEthCsPktInfo; - PVOID pvEThPayload = NULL; + void *pvEThPayload = NULL; struct iphdr *pIpHeader = NULL; int uiSfIndex = 0; unsigned short usIndex = Adapter->usBestEffortQueueIndex; @@ -823,7 +823,7 @@ static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter, struct sk_buff* skb, return bClassificationSucceed; } -static void EThCSGetPktInfo(PMINI_ADAPTER Adapter, PVOID pvEthPayload, +static void EThCSGetPktInfo(PMINI_ADAPTER Adapter, void *pvEthPayload, PS_ETHCS_PKT_INFO pstEthCsPktInfo) { unsigned short u16Etype = ntohs(((ETH_HEADER_STRUC*)pvEthPayload)->u16Etype); diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h index 9b42291..da6c4fd 100644 --- a/drivers/staging/bcm/Typedefs.h +++ b/drivers/staging/bcm/Typedefs.h @@ -20,7 +20,6 @@ typedef unsigned long ULONG; typedef unsigned long DWORD; typedef long* PLONG; -typedef void* PVOID; typedef unsigned int* PUINT; typedef unsigned long* PULONG; diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c index a97ec01..a5ccd6a 100644 --- a/drivers/staging/bcm/hostmibs.c +++ b/drivers/staging/bcm/hostmibs.c @@ -28,18 +28,16 @@ int ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMib /* Copy the classifier Table */ for (nClassifierIndex = 0; nClassifierIndex < MAX_CLASSIFIERS; nClassifierIndex++) { if (Adapter->astClassifierTable[nClassifierIndex].bUsed == TRUE) - memcpy((PVOID) & pstHostMibs-> - astClassifierTable[nClassifierIndex], - (PVOID) & Adapter-> - astClassifierTable[nClassifierIndex], + memcpy(&pstHostMibs->astClassifierTable[nClassifierIndex], + &Adapter->astClassifierTable[nClassifierIndex], sizeof(S_MIBS_CLASSIFIER_RULE)); } /* Copy the SF Table */ for (nSfIndex = 0; nSfIndex < NO_OF_QUEUES; nSfIndex++) { if (Adapter->PackInfo[nSfIndex].bValid) { - memcpy((PVOID) & pstHostMibs->astSFtable[nSfIndex], - (PVOID) & Adapter->PackInfo[nSfIndex], + memcpy(&pstHostMibs->astSFtable[nSfIndex], + &Adapter->PackInfo[nSfIndex], sizeof(S_MIBS_SERVICEFLOW_TABLE)); } else { /* If index in not valid, diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 6d32dee..93c4b67 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -631,7 +631,7 @@ static int FlashSectorErase(PMINI_ADAPTER Adapter, static int flashByteWrite( PMINI_ADAPTER Adapter, UINT uiOffset, - PVOID pData) + void *pData) { UINT uiStatus = 0; @@ -715,7 +715,7 @@ static int flashByteWrite( static int flashWrite( PMINI_ADAPTER Adapter, UINT uiOffset, - PVOID pData) + void *pData) { //UINT uiStatus = 0; @@ -796,7 +796,7 @@ static int flashWrite( static int flashByteWriteStatus( PMINI_ADAPTER Adapter, UINT uiOffset, - PVOID pData) + void *pData) { UINT uiStatus = 0; int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3 @@ -877,7 +877,7 @@ static int flashByteWriteStatus( static int flashWriteStatus( PMINI_ADAPTER Adapter, UINT uiOffset, - PVOID pData) + void *pData) { UINT uiStatus = 0; int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3 diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c index 924cd1f..2929f68 100644 --- a/drivers/staging/bcm/vendorspecificextn.c +++ b/drivers/staging/bcm/vendorspecificextn.c @@ -11,7 +11,7 @@ // STATUS_SUCCESS/STATUS_FAILURE // //----------------------------------------------------------------------------- -int vendorextnGetSectionInfo(PVOID pContext, PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo) +int vendorextnGetSectionInfo(void *pContext, PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo) { return STATUS_FAILURE; } @@ -89,7 +89,7 @@ int vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg) // //------------------------------------------------------------------ -int vendorextnReadSection(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, +int vendorextnReadSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, UINT offset, UINT numOfBytes) { return STATUS_FAILURE; @@ -114,7 +114,7 @@ int vendorextnReadSection(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTI // STATUS_SUCCESS/STATUS_FAILURE // //------------------------------------------------------------------ -int vendorextnWriteSection(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, +int vendorextnWriteSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, UINT offset, UINT numOfBytes, BOOLEAN bVerify) { return STATUS_FAILURE; @@ -138,7 +138,7 @@ int vendorextnWriteSection(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECT // STATUS_SUCCESS/STATUS_FAILURE // //------------------------------------------------------------------ -int vendorextnWriteSectionWithoutErase(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, +int vendorextnWriteSectionWithoutErase(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, UINT offset, UINT numOfBytes) { return STATUS_FAILURE; diff --git a/drivers/staging/bcm/vendorspecificextn.h b/drivers/staging/bcm/vendorspecificextn.h index f646eff..26ce151 100644 --- a/drivers/staging/bcm/vendorspecificextn.h +++ b/drivers/staging/bcm/vendorspecificextn.h @@ -4,15 +4,15 @@ #define CONTINUE_COMMON_PATH 0xFFFF -int vendorextnGetSectionInfo(PVOID pContext, PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo); +int vendorextnGetSectionInfo(void *pContext, PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo); int vendorextnExit(PMINI_ADAPTER Adapter); int vendorextnInit(PMINI_ADAPTER Adapter); int vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg); -int vendorextnReadSection(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, +int vendorextnReadSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, UINT offset, UINT numOfBytes); -int vendorextnWriteSection(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, +int vendorextnWriteSection(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, UINT offset, UINT numOfBytes, BOOLEAN bVerify); -int vendorextnWriteSectionWithoutErase(PVOID pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, +int vendorextnWriteSectionWithoutErase(void *pContext, unsigned char *pBuffer, FLASH2X_SECTION_VAL SectionVal, UINT offset, UINT numOfBytes); #endif /* */ -- 1.7.8.111.gad25c.dirty _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
