Remove user-defined data type PVOID and replace it with void *. Signed-off-by: Lisa Nguyen <lisa@xxxxxxxxxxxxxxx> --- drivers/staging/bcm/Adapter.h | 22 +++++++++++----------- drivers/staging/bcm/Bcmchar.c | 6 +++--- drivers/staging/bcm/CmHost.c | 16 ++++++++-------- drivers/staging/bcm/HandleControlPacket.c | 2 +- drivers/staging/bcm/IPv6Protocol.c | 4 ++-- drivers/staging/bcm/InterfaceDld.c | 4 ++-- drivers/staging/bcm/InterfaceMisc.h | 16 ++++++++-------- drivers/staging/bcm/InterfaceTx.c | 4 ++-- drivers/staging/bcm/InterfaceTx.h | 2 +- drivers/staging/bcm/Prototypes.h | 4 ++-- drivers/staging/bcm/Qos.c | 6 +++--- drivers/staging/bcm/Typedefs.h | 1 - drivers/staging/bcm/hostmibs.c | 8 ++++---- drivers/staging/bcm/nvm.c | 8 ++++---- drivers/staging/bcm/vendorspecificextn.c | 8 ++++---- drivers/staging/bcm/vendorspecificextn.h | 8 ++++---- 16 files changed, 59 insertions(+), 60 deletions(-) diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index 9cd5987..56fed62 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h @@ -20,7 +20,7 @@ struct bcm_packettosend { } __packed; struct bcm_control_packet { - PVOID ControlBuff; + void *ControlBuff; UINT ControlBuffLen; struct bcm_control_packet *next; } __packed; @@ -208,9 +208,9 @@ struct bcm_targetdsx_buffer { bool valid; }; -typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID); +typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, void *); -typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID); +typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, void *); /* * Driver adapter data structure @@ -308,22 +308,22 @@ struct bcm_mini_adapter { /* Driver State for LED Blinking */ enum bcm_led_events 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); bool IdleMode; bool bDregRequestSentInIdleMode; bool bTriedToWakeUpFromlowPowerMode; diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 8c81143..f29c545 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -714,7 +714,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(struct bcm_ioctl_buffer))) @@ -744,7 +744,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); @@ -1075,7 +1075,7 @@ cntrlEnd: break; case IOCTL_BCM_GET_HOST_MIBS: { - PVOID temp_buff; + void *temp_buff; if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) return -EFAULT; diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index cc91b5e..810a170f 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -107,7 +107,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn DeleteAllClassifiersForSF(Adapter, uiSearchRuleIndex); /* Resetting only MIBS related entries in the SF */ - memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(struct bcm_mibs_table)); + memset((void *)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(struct bcm_mibs_table)); } static inline VOID @@ -829,7 +829,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer * * Returns - None *************************************************************************/ -static VOID DumpCmControlPacket(PVOID pvBuffer) +static VOID DumpCmControlPacket(void *pvBuffer) { int uiLoopIndex; int nIndex; @@ -1331,7 +1331,7 @@ static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, return 1; } -ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength) +ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, void *pvBuffer, UINT *puBufferLength) { struct bcm_add_indication_alt *pstAddIndicationAlt = NULL; struct bcm_add_indication *pstAddIndication = NULL; @@ -1446,7 +1446,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu } static inline struct bcm_add_indication_alt -*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer) +*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register void *pvBuffer) { ULONG ulStatus = 0; struct bcm_add_indication *pstAddIndication = NULL; @@ -1631,7 +1631,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter) * @return - Queue index for the free SFID else returns Invalid Index. */ bool CmControlResponseMessage(struct bcm_mini_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 */) { struct bcm_connect_mgr_params *psfLocalSet = NULL; struct bcm_add_indication_alt *pstAddIndication = NULL; @@ -1669,7 +1669,7 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to ((struct bcm_add_indication_alt *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSA_RSP; BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " VCID = %x", ntohs(pstAddIndication->u16VCID)); - CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); + CopyBufferToControlPacket(Adapter, (void *)Adapter->caDsxReqResp); kfree(pstAddIndication); } break; @@ -1780,7 +1780,7 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to *((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *pstChangeIndication; ((struct bcm_change_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP; - CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); + CopyBufferToControlPacket(Adapter, (void *)Adapter->caDsxReqResp); kfree(pstAddIndication); } break; @@ -1871,7 +1871,7 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SENDING DSD RESPONSE TO MAC"); ((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSD_RSP; - CopyBufferToControlPacket(Adapter, (PVOID)Adapter->caDsxReqResp); + CopyBufferToControlPacket(Adapter, (void *)Adapter->caDsxReqResp); } case DSD_RSP: { diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c index 495fe3d..c086169 100644 --- a/drivers/staging/bcm/HandleControlPacket.c +++ b/drivers/staging/bcm/HandleControlPacket.c @@ -225,7 +225,7 @@ INT flushAllAppQ(void) } pTarang->AppCtrlQueueLen = 0; /* dropped contrl packet statistics also should be reset. */ - memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0, + memset((void *)&pTarang->stDroppedAppCntrlMsgs, 0, sizeof(struct bcm_mibs_dropped_cntrl_msg)); } diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c index cd16067..a6b2686 100644 --- a/drivers/staging/bcm/IPv6Protocol.c +++ b/drivers/staging/bcm/IPv6Protocol.c @@ -178,9 +178,9 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload, USHORT *pusSrcPort, /* * Arg 1 struct bcm_mini_adapter *Adapter is a pointer ot the driver contorl structure - * Arg 2 PVOID pcIpHeader is a pointer to the IP header of the packet + * Arg 2 void *pcIpHeader is a pointer to the IP header of the packet */ -USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader, +USHORT IpVersion6(struct bcm_mini_adapter *Adapter, void *pcIpHeader, struct bcm_classifier_rule *pstClassifierRule) { USHORT ushDestPort = 0; diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c index 463bdee..df8a6ac 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}; @@ -52,7 +52,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.h b/drivers/staging/bcm/InterfaceMisc.h index bce6869..ae72af3 100644 --- a/drivers/staging/bcm/InterfaceMisc.h +++ b/drivers/staging/bcm/InterfaceMisc.h @@ -4,33 +4,33 @@ INT InterfaceRDM(struct bcm_interface_adapter *psIntfAdapter, UINT addr, - PVOID buff, + void *buff, INT len); INT InterfaceWRM(struct bcm_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(struct bcm_mini_adapter *Adapter); diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c index b9c2784..4d81bc7 100644 --- a/drivers/staging/bcm/InterfaceTx.c +++ b/drivers/staging/bcm/InterfaceTx.c @@ -128,7 +128,7 @@ static struct bcm_usb_tcb *GetBulkOutTcb(struct bcm_interface_adapter *psIntfAda return pTcb; } -static int TransmitTcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_usb_tcb *pTcb, PVOID data, int len) +static int TransmitTcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_usb_tcb *pTcb, void *data, int len) { struct urb *urb = pTcb->urb; @@ -180,7 +180,7 @@ static int TransmitTcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_u return retval; } -int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len) +int InterfaceTransmitPacket(void *arg, void *data, UINT len) { struct bcm_usb_tcb *pTcb= NULL; diff --git a/drivers/staging/bcm/InterfaceTx.h b/drivers/staging/bcm/InterfaceTx.h index 2731475..7ba998e 100644 --- a/drivers/staging/bcm/InterfaceTx.h +++ b/drivers/staging/bcm/InterfaceTx.h @@ -1,7 +1,7 @@ #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/Prototypes.h b/drivers/staging/bcm/Prototypes.h index fb53a00..7a6d292 100644 --- a/drivers/staging/bcm/Prototypes.h +++ b/drivers/staging/bcm/Prototypes.h @@ -3,7 +3,7 @@ VOID LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer); -VOID StatisticsResponse(struct bcm_mini_adapter *Adapter,PVOID pvBuffer); +VOID StatisticsResponse(struct bcm_mini_adapter *Adapter, void *pvBuffer); VOID IdleModeResponse(struct bcm_mini_adapter *Adapter,PUINT puiBuffer); @@ -18,7 +18,7 @@ int register_control_device_interface(struct bcm_mini_adapter *ps_adapter); void unregister_control_device_interface(struct bcm_mini_adapter *Adapter); INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter,/**<Logical Adapter*/ - PVOID ioBuffer/**<Control Packet Buffer*/ + void *ioBuffer/**<Control Packet Buffer*/ ); VOID SortPackInfo(struct bcm_mini_adapter *Adapter); diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 1609a2b..9e392e1 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -4,7 +4,7 @@ This file contains the routines related to Quality of Service. */ #include "headers.h" -static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); +static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, void *pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo, struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd, @@ -447,7 +447,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter, struct sk_buff* skb) INT uiLoopIndex = 0; struct bcm_classifier_rule *pstClassifierRule = NULL; struct bcm_eth_packet_info stEthCsPktInfo; - PVOID pvEThPayload = NULL; + void *pvEThPayload = NULL; struct iphdr *pIpHeader = NULL; INT uiSfIndex = 0; USHORT usIndex = Adapter->usBestEffortQueueIndex; @@ -801,7 +801,7 @@ static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* s return bClassificationSucceed; } -static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID pvEthPayload, +static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, void *pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo) { USHORT u16Etype = ntohs(((struct bcm_eth_header *)pvEthPayload)->u16Etype); diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h index 832adcf..9d8fd1b 100644 --- a/drivers/staging/bcm/Typedefs.h +++ b/drivers/staging/bcm/Typedefs.h @@ -29,7 +29,6 @@ typedef char* PCHAR; typedef short* PSHORT; typedef int* PINT; typedef long* PLONG; -typedef void* PVOID; typedef unsigned char* PUCHAR; typedef unsigned short* PUSHORT; diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c index f55300d..638e5cc 100644 --- a/drivers/staging/bcm/hostmibs.c +++ b/drivers/staging/bcm/hostmibs.c @@ -27,9 +27,9 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m /* Copy the classifier Table */ for (nClassifierIndex = 0; nClassifierIndex < MAX_CLASSIFIERS; nClassifierIndex++) { if (Adapter->astClassifierTable[nClassifierIndex].bUsed == TRUE) - memcpy((PVOID) & pstHostMibs-> + memcpy((void *) & pstHostMibs-> astClassifierTable[nClassifierIndex], - (PVOID) & Adapter-> + (void *) & Adapter-> astClassifierTable[nClassifierIndex], sizeof(struct bcm_mibs_classifier_rule)); } @@ -37,8 +37,8 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m /* 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((void *) & pstHostMibs->astSFtable[nSfIndex], + (void *) & Adapter->PackInfo[nSfIndex], sizeof(struct bcm_mibs_table)); } else { /* If index in not valid, diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 9e5f955..017c347 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -605,7 +605,7 @@ static int FlashSectorErase(struct bcm_mini_adapter *Adapter, static int flashByteWrite(struct bcm_mini_adapter *Adapter, unsigned int uiOffset, - PVOID pData) + void *pData) { unsigned int uiStatus = 0; int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; /* 3 */ @@ -682,7 +682,7 @@ static int flashByteWrite(struct bcm_mini_adapter *Adapter, static int flashWrite(struct bcm_mini_adapter *Adapter, unsigned int uiOffset, - PVOID pData) + void *pData) { /* unsigned int uiStatus = 0; * int iRetries = 0; @@ -760,7 +760,7 @@ static int flashWrite(struct bcm_mini_adapter *Adapter, */ static int flashByteWriteStatus(struct bcm_mini_adapter *Adapter, unsigned int uiOffset, - PVOID pData) + void *pData) { unsigned int uiStatus = 0; int iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; /* 3 */ @@ -838,7 +838,7 @@ static int flashByteWriteStatus(struct bcm_mini_adapter *Adapter, static int flashWriteStatus(struct bcm_mini_adapter *Adapter, unsigned int uiOffset, - PVOID pData) + void *pData) { unsigned int 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 2c57a16..ad59cdb 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, struct bcm_flash2x_vendor_info *pVendorInfo) +INT vendorextnGetSectionInfo(void *pContext, struct bcm_flash2x_vendor_info *pVendorInfo) { return STATUS_FAILURE; } @@ -88,7 +88,7 @@ INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg) * STATUS_SUCCESS/STATUS_FAILURE */ -INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, +INT vendorextnReadSection(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, UINT offset, UINT numOfBytes) { return STATUS_FAILURE; @@ -112,7 +112,7 @@ INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_sect * Returns: * STATUS_SUCCESS/STATUS_FAILURE */ -INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, +INT vendorextnWriteSection(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, UINT offset, UINT numOfBytes, bool bVerify) { return STATUS_FAILURE; @@ -135,7 +135,7 @@ INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_sec * Returns: * STATUS_SUCCESS/STATUS_FAILURE */ -INT vendorextnWriteSectionWithoutErase(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, +INT vendorextnWriteSectionWithoutErase(void *pContext, PUCHAR pBuffer, enum bcm_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 ff57f05..726a972 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, struct bcm_flash2x_vendor_info *pVendorInfo); +INT vendorextnGetSectionInfo(void *pContext, struct bcm_flash2x_vendor_info *pVendorInfo); INT vendorextnExit(struct bcm_mini_adapter *Adapter); INT vendorextnInit(struct bcm_mini_adapter *Adapter); INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg); -INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, +INT vendorextnReadSection(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, UINT offset, UINT numOfBytes); -INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, +INT vendorextnWriteSection(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, UINT offset, UINT numOfBytes, bool bVerify); -INT vendorextnWriteSectionWithoutErase(PVOID pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, +INT vendorextnWriteSectionWithoutErase(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal, UINT offset, UINT numOfBytes); #endif /* */ -- 1.8.1.2 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel