Replace user-defined data type INT with C defined int data type.
Signed-off-by: Lisa Nguyen <lisa@xxxxxxxxxxxxxxx>
---
drivers/staging/bcm/Bcmchar.c | 14 +++----
drivers/staging/bcm/Bcmnet.c | 4 +-
drivers/staging/bcm/HandleControlPacket.c | 2 +-
drivers/staging/bcm/IPv6Protocol.c | 2 +-
drivers/staging/bcm/InterfaceDld.c | 12 +++---
drivers/staging/bcm/InterfaceIdleMode.c | 2 +-
drivers/staging/bcm/InterfaceIdleMode.h | 6 +--
drivers/staging/bcm/InterfaceIsr.c | 4 +-
drivers/staging/bcm/InterfaceIsr.h | 2 +-
drivers/staging/bcm/InterfaceMisc.h | 16 ++++----
drivers/staging/bcm/InterfaceTx.h | 2 +-
drivers/staging/bcm/LeakyBucket.c | 8 ++--
drivers/staging/bcm/Prototypes.h | 62 +++++++++++++++----------------
drivers/staging/bcm/Qos.c | 12 +++---
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/hostmibs.c | 2 +-
drivers/staging/bcm/led_control.c | 24 ++++++------
drivers/staging/bcm/vendorspecificextn.c | 14 +++----
drivers/staging/bcm/vendorspecificextn.h | 14 +++----
19 files changed, 100 insertions(+), 103 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f29c545..4d7b5da 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -155,7 +155,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
struct bcm_tarang_data *pTarang = filp->private_data;
void __user *argp = (void __user *)arg;
struct bcm_mini_adapter *Adapter = pTarang->Adapter;
- INT Status = STATUS_FAILURE;
+ int Status = STATUS_FAILURE;
int timeout = 0;
struct bcm_ioctl_buffer IoBuffer;
int bytes;
@@ -935,7 +935,7 @@ cntrlEnd:
break;
case IOCTL_CHIP_RESET: {
- INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
+ int NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
if (NVMAccess) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, " IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
return -EACCES;
@@ -1656,7 +1656,7 @@ cntrlEnd:
return -EFAULT;
}
- Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
+ Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(int));
if (Status) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
return -EFAULT;
@@ -1811,7 +1811,7 @@ cntrlEnd:
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
return -EFAULT;
}
- Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
+ Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(int));
if (Status) {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
return -EFAULT;
@@ -1841,9 +1841,9 @@ cntrlEnd:
case IOCTL_BCM_NVM_RAW_READ: {
struct bcm_nvm_readwrite stNVMRead;
- INT NOB ;
- INT BuffSize ;
- INT ReadOffset = 0;
+ int NOB ;
+ int BuffSize ;
+ int ReadOffset = 0;
UINT ReadBytes = 0 ;
PUCHAR pReadBuff;
void __user *OutPutBuff;
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 53fee2f..bc7417e 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -2,7 +2,7 @@
struct net_device *gblpnetdev;
-static INT bcm_open(struct net_device *dev)
+static int bcm_open(struct net_device *dev)
{
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
@@ -26,7 +26,7 @@ static INT bcm_open(struct net_device *dev)
return 0;
}
-static INT bcm_close(struct net_device *dev)
+static int bcm_close(struct net_device *dev)
{
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 1973d27..9b74768 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -211,7 +211,7 @@ int control_packet_handler(struct bcm_mini_adapter *Adapter /* pointer to adapte
return STATUS_SUCCESS;
}
-INT flushAllAppQ(void)
+int flushAllAppQ(void)
{
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
struct bcm_tarang_data *pTarang = NULL;
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index a6b2686..2ab5cfb 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -274,7 +274,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, void *pcIpHeader,
} while (0);
if (bClassificationSucceed == TRUE) {
- INT iMatchedSFQueueIndex = 0;
+ int iMatchedSFQueueIndex = 0;
iMatchedSFQueueIndex = SearchSfid(Adapter, pstClassifierRule->ulSFID);
if (iMatchedSFQueueIndex >= NO_OF_QUEUES) {
bClassificationSucceed = false;
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index df8a6ac..301536b 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -60,7 +60,7 @@ int InterfaceFileReadbackFromChip(void *arg, struct file *flp, unsigned int on_c
int errno = 0, len = 0, is_config_file = 0;
loff_t pos = 0;
static int fw_down;
- INT Status = STATUS_SUCCESS;
+ int Status = STATUS_SUCCESS;
struct bcm_interface_adapter *psIntfAdapter = arg;
int bytes;
@@ -254,7 +254,7 @@ error:
return retval;
}
-static INT buffDnld(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
+static int buffDnld(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
{
unsigned int len = 0;
int retval = STATUS_SUCCESS;
@@ -275,10 +275,10 @@ static INT buffDnld(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT
return retval;
}
-static INT buffRdbkVerify(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
+static int buffRdbkVerify(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
{
UINT len = u32FirmwareLength;
- INT retval = STATUS_SUCCESS;
+ int retval = STATUS_SUCCESS;
PUCHAR readbackbuff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
int bytes;
@@ -312,9 +312,9 @@ static INT buffRdbkVerify(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer,
return retval;
}
-INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, unsigned long u32StartingAddress)
+int buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, unsigned long u32StartingAddress)
{
- INT status = STATUS_SUCCESS;
+ int status = STATUS_SUCCESS;
status = buffDnld(Adapter, mappedbuffer, u32FirmwareLength, u32StartingAddress);
if (status != STATUS_SUCCESS) {
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 5959fbd..1432dba 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -234,7 +234,7 @@ int InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter)
void InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter)
{
unsigned int uiRegVal = 0;
- INT Status = 0;
+ int Status = 0;
int bytes;
if (Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING) {
diff --git a/drivers/staging/bcm/InterfaceIdleMode.h b/drivers/staging/bcm/InterfaceIdleMode.h
index 2ef6400..642a23c 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
@@ -1,14 +1,14 @@
#ifndef _INTERFACE_IDLEMODE_H
#define _INTERFACE_IDLEMODE_H
-INT InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter);
+int InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter);
-INT InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter,
+int InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter,
unsigned int *puiBuffer);
VOID InterfaceWriteIdleModeWakePattern(struct bcm_mini_adapter *Adapter);
-INT InterfaceWakeUp(struct bcm_mini_adapter *Adapter);
+int InterfaceWakeUp(struct bcm_mini_adapter *Adapter);
VOID InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter);
#endif
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index 7b39f4f..b4ad1a0 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -143,9 +143,9 @@ int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
}
-INT StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
+int StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter)
{
- INT status = 0;
+ int status = 0;
if( false == psIntfAdapter->psAdapter->device_removed &&
false == psIntfAdapter->psAdapter->bEndPointHalted &&
diff --git a/drivers/staging/bcm/InterfaceIsr.h b/drivers/staging/bcm/InterfaceIsr.h
index 3073bd7..f62b3bf 100644
--- a/drivers/staging/bcm/InterfaceIsr.h
+++ b/drivers/staging/bcm/InterfaceIsr.h
@@ -4,7 +4,7 @@
int CreateInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
-INT StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
+int StartInterruptUrb(struct bcm_interface_adapter *psIntfAdapter);
VOID InterfaceEnableInterrupt(struct bcm_mini_adapter *Adapter);
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index ae72af3..161300c 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -1,17 +1,15 @@
#ifndef __INTERFACE_MISC_H
#define __INTERFACE_MISC_H
-INT
-InterfaceRDM(struct bcm_interface_adapter *psIntfAdapter,
+int InterfaceRDM(struct bcm_interface_adapter *psIntfAdapter,
UINT addr,
void *buff,
- INT len);
+ int len);
-INT
-InterfaceWRM(struct bcm_interface_adapter *psIntfAdapter,
+int InterfaceWRM(struct bcm_interface_adapter *psIntfAdapter,
UINT addr,
void *buff,
- INT len);
+ int len);
int InterfaceFileDownload(void *psIntfAdapter,
@@ -26,14 +24,14 @@ int InterfaceFileReadbackFromChip(void *psIntfAdapter,
int BcmRDM(void *arg,
UINT addr,
void *buff,
- INT len);
+ int len);
int BcmWRM(void *arg,
UINT addr,
void *buff,
- INT len);
+ int len);
-INT Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter);
+int Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter);
VOID Bcm_kill_all_URBs(struct bcm_interface_adapter *psIntfAdapter);
diff --git a/drivers/staging/bcm/InterfaceTx.h b/drivers/staging/bcm/InterfaceTx.h
index 7ba998e..8547691 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(void *arg, void *data, UINT len);
+int InterfaceTransmitPacket(void *arg, void *data, UINT len);
#endif
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index f95b067..b58fa18 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -18,7 +18,7 @@
static VOID UpdateTokenCount(register struct bcm_mini_adapter *Adapter)
{
ULONG liCurrentTime;
- INT i = 0;
+ int i = 0;
struct timeval tv;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL,
@@ -102,11 +102,11 @@ static ULONG GetSFTokenCount(struct bcm_mini_adapter *Adapter, struct bcm_packet
This function despatches packet from the specified queue.
@return Zero(success) or Negative value(failure)
*/
-static INT SendPacketFromQueue(struct bcm_mini_adapter *Adapter,/**<Logical Adapter*/
+static int SendPacketFromQueue(struct bcm_mini_adapter *Adapter,/**<Logical Adapter*/
struct bcm_packet_info *psSF, /**<Queue identifier*/
struct sk_buff *Packet) /**<Pointer to the packet to be sent*/
{
- INT Status = STATUS_FAILURE;
+ int Status = STATUS_FAILURE;
UINT uiIndex = 0, PktLen = 0;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, SEND_QUEUE, DBG_LVL_ALL, "=====>");
@@ -146,7 +146,7 @@ static VOID CheckAndSendPacketFromIndex(struct bcm_mini_adapter *Adapter, struct
{
struct sk_buff *QueuePacket = NULL;
char *pControlPacket = NULL;
- INT Status = 0;
+ int Status = 0;
int iPacketLen = 0;
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 7a6d292..8e052cd 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -17,7 +17,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*/
+int CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter,/**<Logical Adapter*/
void *ioBuffer/**<Control Packet Buffer*/
);
@@ -29,7 +29,7 @@ VOID flush_all_queues(struct bcm_mini_adapter *Adapter);
VOID PruneQueueAllSF(struct bcm_mini_adapter *Adapter);
-INT SearchSfid(struct bcm_mini_adapter *Adapter,UINT uiSfid);
+int SearchSfid(struct bcm_mini_adapter *Adapter,UINT uiSfid);
USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb);
@@ -38,7 +38,7 @@ bool MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPo
bool MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol);
-INT SetupNextSend(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
+int SetupNextSend(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
struct sk_buff *Packet, /**<data buffer*/
USHORT Vcid) ;
@@ -46,7 +46,7 @@ VOID LinkMessage(struct bcm_mini_adapter *Adapter);
VOID transmit_packets(struct bcm_mini_adapter *Adapter);
-INT SendControlPacket(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
+int SendControlPacket(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
char *pControlPacket/**<Control Packet*/
);
@@ -54,11 +54,11 @@ INT SendControlPacket(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
int register_networkdev(struct bcm_mini_adapter *Adapter);
void unregister_networkdev(struct bcm_mini_adapter *Adapter);
-INT AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
+int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
VOID AdapterFree(struct bcm_mini_adapter *Adapter);
-INT FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
+int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
int tx_pkt_handler(struct bcm_mini_adapter *Adapter);
@@ -69,7 +69,7 @@ int run_card_proc(struct bcm_mini_adapter *Adapter );
int InitCardAndDownloadFirmware(struct bcm_mini_adapter *ps_adapter);
-INT ReadMacAddressFromNVM(struct bcm_mini_adapter *Adapter);
+int ReadMacAddressFromNVM(struct bcm_mini_adapter *Adapter);
int register_control_device_interface(struct bcm_mini_adapter *ps_adapter);
@@ -117,10 +117,10 @@ 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(
+int BeceemEEPROMBulkRead(
struct bcm_mini_adapter *Adapter,
PUINT pBuffer,
UINT uiOffset,
@@ -128,12 +128,12 @@ INT BeceemEEPROMBulkRead(
-INT WriteBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT uiEEPROMOffset, UINT uiData);
+int WriteBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT uiEEPROMOffset, UINT uiData);
-INT PropagateCalParamsFromFlashToMemory(struct bcm_mini_adapter *Adapter);
+int PropagateCalParamsFromFlashToMemory(struct bcm_mini_adapter *Adapter);
-INT BeceemEEPROMBulkWrite(
+int BeceemEEPROMBulkWrite(
struct bcm_mini_adapter *Adapter,
PUCHAR pBuffer,
UINT uiOffset,
@@ -141,16 +141,16 @@ INT BeceemEEPROMBulkWrite(
bool bVerify);
-INT ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData);
+int ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData);
-INT BeceemNVMRead(
+int BeceemNVMRead(
struct bcm_mini_adapter *Adapter,
PUINT pBuffer,
UINT uiOffset,
UINT uiNumBytes);
-INT BeceemNVMWrite(
+int BeceemNVMWrite(
struct bcm_mini_adapter *Adapter,
PUINT pBuffer,
UINT uiOffset,
@@ -158,14 +158,14 @@ INT BeceemNVMWrite(
bool bVerify);
-INT BcmInitNVM(struct bcm_mini_adapter *Adapter);
+int BcmInitNVM(struct bcm_mini_adapter *Adapter);
-INT BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize);
+int BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize);
bool IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val section);
-INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_bitmap *psFlash2xBitMap);
+int BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_bitmap *psFlash2xBitMap);
-INT BcmFlash2xBulkWrite(
+int BcmFlash2xBulkWrite(
struct bcm_mini_adapter *Adapter,
PUINT pBuffer,
enum bcm_flash2x_section_val eFlashSectionVal,
@@ -173,25 +173,25 @@ INT BcmFlash2xBulkWrite(
UINT uiNumBytes,
UINT bVerify);
-INT BcmFlash2xBulkRead(
+int BcmFlash2xBulkRead(
struct bcm_mini_adapter *Adapter,
PUINT pBuffer,
enum bcm_flash2x_section_val eFlashSectionVal,
UINT uiOffsetWithinSectionVal,
UINT uiNumBytes);
-INT BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal);
+int BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal);
-INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectVal);
-INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
-INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
+int BcmSetActiveSection(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectVal);
+int BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
+int BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
-INT BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut);
-INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
-INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal);
-INT validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite);
-INT IsFlash2x(struct bcm_mini_adapter *Adapter);
-INT BcmCopySection(struct bcm_mini_adapter *Adapter,
+int BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut);
+int BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlash2xSectionVal);
+int BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, enum bcm_flash2x_section_val eFlashSectionVal);
+int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite);
+int IsFlash2x(struct bcm_mini_adapter *Adapter);
+int BcmCopySection(struct bcm_mini_adapter *Adapter,
enum bcm_flash2x_section_val SrcSection,
enum bcm_flash2x_section_val DstSection,
UINT offset,
@@ -207,7 +207,7 @@ int wrmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned i
int rdmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, unsigned int *pucBuff, size_t sSize);
int wrmWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
-INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
+int buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
unsigned long u32StartingAddress);
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 9e392e1..a8dd9c3 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);
/*******************************************************************
@@ -282,7 +282,7 @@ static USHORT IpVersion4(struct bcm_mini_adapter *Adapter,
if (TRUE == bClassificationSucceed)
{
- INT iMatchedSFQueueIndex = 0;
+ int iMatchedSFQueueIndex = 0;
iMatchedSFQueueIndex = SearchSfid(Adapter, pstClassifierRule->ulSFID);
if (iMatchedSFQueueIndex >= NO_OF_QUEUES)
{
@@ -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;
@@ -394,7 +394,7 @@ static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex)
VOID flush_all_queues(struct bcm_mini_adapter *Adapter)
{
- INT iQIndex;
+ int iQIndex;
UINT uiTotalPacketLength;
struct sk_buff* PacketToDrop = NULL;
@@ -444,12 +444,12 @@ VOID flush_all_queues(struct bcm_mini_adapter *Adapter)
USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter, struct sk_buff* skb)
{
- INT uiLoopIndex = 0;
+ int uiLoopIndex = 0;
struct bcm_classifier_rule *pstClassifierRule = NULL;
struct bcm_eth_packet_info stEthCsPktInfo;
void *pvEThPayload = NULL;
struct iphdr *pIpHeader = NULL;
- INT uiSfIndex = 0;
+ int uiSfIndex = 0;
USHORT usIndex = Adapter->usBestEffortQueueIndex;
bool bFragmentedPkt = false, bClassificationSucceed = false;
USHORT usCurrFragment = 0;
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index 389850d..290b05f 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -10,7 +10,6 @@
#define TRUE 1
-typedef int INT;
typedef long LONG;
typedef void VOID;
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 638e5cc..e0b20a9 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -9,7 +9,7 @@
#include "headers.h"
-INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mibs *pstHostMibs)
+int ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mibs *pstHostMibs)
{
struct bcm_phs_entry *pstServiceFlowEntry = NULL;
struct bcm_phs_rule *pstPhsRule = NULL;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index eee4f47..0dbf610 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -15,7 +15,7 @@ static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)
bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
{
- INT Status;
+ int Status;
Status = (Adapter->gpioBitMap & gpios) ^ gpios;
if (Status)
return false;
@@ -23,8 +23,8 @@ bool IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
return TRUE;
}
-static INT LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
- ULONG timeout, INT num_of_time, enum bcm_led_events currdriverstate)
+static int LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
+ ULONG timeout, int num_of_time, enum bcm_led_events currdriverstate)
{
int Status = STATUS_SUCCESS;
bool bInfinite = false;
@@ -73,7 +73,7 @@ static INT LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLe
return Status;
}
-static INT ScaleRateofTransfer(ULONG rate)
+static int ScaleRateofTransfer(ULONG rate)
{
if (rate <= 3)
return rate;
@@ -95,7 +95,7 @@ static INT ScaleRateofTransfer(ULONG rate)
-static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_Num_tx,
+static int LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_Num_tx,
UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
enum bcm_led_events currdriverstate)
{
@@ -106,7 +106,7 @@ static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_N
/* Rate of transfer of Tx and Rx in 1 sec */
ULONG64 rate_of_transfer_tx = 0, rate_of_transfer_rx = 0;
int Status = STATUS_SUCCESS;
- INT num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
+ int num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
UINT remDelay = 0;
bool bBlinkBothLED = TRUE;
/* UINT GPIO_num = DISABLE_GPIO_NUM; */
@@ -261,10 +261,10 @@ static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_N
* <OSAL_STATUS_CODE>
* -----------------------------------------------------------------------------
*/
-static INT ValidateDSDParamsChecksum(struct bcm_mini_adapter *Adapter, ULONG ulParamOffset,
+static int ValidateDSDParamsChecksum(struct bcm_mini_adapter *Adapter, ULONG ulParamOffset,
USHORT usParamLen)
{
- INT Status = STATUS_SUCCESS;
+ int Status = STATUS_SUCCESS;
PUCHAR puBuffer = NULL;
USHORT usChksmOrg = 0;
USHORT usChecksumCalculated = 0;
@@ -347,10 +347,10 @@ exit:
* <OSAL_STATUS_CODE>
* -----------------------------------------------------------------------------
*/
-static INT ValidateHWParmStructure(struct bcm_mini_adapter *Adapter, ULONG ulHwParamOffset)
+static int ValidateHWParmStructure(struct bcm_mini_adapter *Adapter, ULONG ulHwParamOffset)
{
- INT Status = STATUS_SUCCESS;
+ int Status = STATUS_SUCCESS;
USHORT HwParamLen = 0;
/*
* Add DSD start offset to the hwParamOffset to get
@@ -605,7 +605,7 @@ static VOID LedGpioInit(struct bcm_mini_adapter *Adapter)
Adapter->LEDInfo.bIdle_led_off = false;
}
-static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_tx,
+static int BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_tx,
UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
enum bcm_led_events currdriverstate)
{
@@ -654,7 +654,7 @@ static VOID LEDControlThread(struct bcm_mini_adapter *Adapter)
enum bcm_led_events currdriverstate = 0;
ulong timeout = 0;
- INT Status = 0;
+ int Status = 0;
UCHAR dummyGPIONum = 0;
UCHAR dummyIndex = 0;
diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index ad59cdb..86b18b0 100644
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -11,7 +11,7 @@
* STATUS_SUCCESS/STATUS_FAILURE
*
*/
-INT vendorextnGetSectionInfo(void *pContext, struct bcm_flash2x_vendor_info *pVendorInfo)
+int vendorextnGetSectionInfo(void *pContext, struct bcm_flash2x_vendor_info *pVendorInfo)
{
return STATUS_FAILURE;
}
@@ -28,7 +28,7 @@ INT vendorextnGetSectionInfo(void *pContext, struct bcm_flash2x_vendor_info *pVe
*
*
*/
-INT vendorextnInit(struct bcm_mini_adapter *Adapter)
+int vendorextnInit(struct bcm_mini_adapter *Adapter)
{
return STATUS_SUCCESS;
}
@@ -45,7 +45,7 @@ INT vendorextnInit(struct bcm_mini_adapter *Adapter)
*
*
*/
-INT vendorextnExit(struct bcm_mini_adapter *Adapter)
+int vendorextnExit(struct bcm_mini_adapter *Adapter)
{
return STATUS_SUCCESS;
}
@@ -65,7 +65,7 @@ INT vendorextnExit(struct bcm_mini_adapter *Adapter)
* STATUS_SUCCESS/STATUS_FAILURE as per the IOCTL return value
*/
-INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg)
+int vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg)
{
return CONTINUE_COMMON_PATH;
}
@@ -88,7 +88,7 @@ INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg)
* STATUS_SUCCESS/STATUS_FAILURE
*/
-INT vendorextnReadSection(void *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(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_secti
* Returns:
* STATUS_SUCCESS/STATUS_FAILURE
*/
-INT vendorextnWriteSection(void *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(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_sect
* Returns:
* STATUS_SUCCESS/STATUS_FAILURE
*/
-INT vendorextnWriteSectionWithoutErase(void *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 726a972..36a7eb8 100644
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -4,15 +4,15 @@
#define CONTINUE_COMMON_PATH 0xFFFF
-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(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
+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(void *pContext, PUCHAR pBuffer, enum bcm_flash2x_section_val SectionVal,
UINT offset, UINT numOfBytes);
-INT vendorextnWriteSection(void *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(void *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
