Use the normal types.
Remove the now unused typdef.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/bcm/Adapter.h | 10 +++---
drivers/staging/bcm/HostMIBSInterface.h | 50 +++++++++++++++---------------
drivers/staging/bcm/Ioctl.h | 2 +-
drivers/staging/bcm/Qos.c | 6 ++--
drivers/staging/bcm/Transmit.c | 4 +-
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/hostmibs.c | 4 +-
7 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index a329e16..c80c496 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -147,7 +147,7 @@ typedef struct _S_CLASSIFIER_RULE {
//For IPv6 Addressing
unsigned char ucDirection;
BOOLEAN bIpv6Protocol;
- UINT32 u32PHSRuleID;
+ unsigned int u32PHSRuleID;
S_PHS_RULE sPhsRule;
unsigned char u8AssociatedPHSI;
@@ -489,11 +489,11 @@ struct _MINI_ADAPTER {
BOOLEAN AutoFirmDld;
BOOLEAN bMipsConfig;
BOOLEAN bDPLLConfig;
- UINT32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
- UINT32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+ unsigned int aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+ unsigned int aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
S_FRAGMENTED_PACKET_INFO astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
atomic_t uiMBupdate;
- UINT32 PmuMode;
+ unsigned int PmuMode;
NVM_TYPE eNVMType;
unsigned int uiSectorSize;
unsigned int uiSectorSizeInCFG;
@@ -538,7 +538,7 @@ struct _MINI_ADAPTER {
BOOLEAN bDoSuspend ;
unsigned int syscfgBefFwDld ;
BOOLEAN StopAllXaction ;
- UINT32 liTimeSinceLastNetEntry; //Used to Support extended CAPI requirements from
+ unsigned int liTimeSinceLastNetEntry; //Used to Support extended CAPI requirements from
struct semaphore LowPowerModeSync;
unsigned long liDrainCalculated;
unsigned int gpioBitMap;
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 184d04f..f3ba2c3 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -66,9 +66,9 @@ typedef struct _S_MIBS_HOST_INFO {
unsigned long LastTxQueueIndex;
BOOLEAN TxOutofDescriptors;
BOOLEAN TimerActive;
- UINT32 u32TotalDSD;
- UINT32 aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
- UINT32 aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+ unsigned int u32TotalDSD;
+ unsigned int aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+ unsigned int aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
}S_MIBS_HOST_INFO;
typedef struct _S_MIBS_CLASSIFIER_RULE {
@@ -104,7 +104,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
BOOLEAN bSrcIpValid;
unsigned char ucDirection;
BOOLEAN bIpv6Protocol;
- UINT32 u32PHSRuleID;
+ unsigned int u32PHSRuleID;
}S_MIBS_CLASSIFIER_RULE;
@@ -131,27 +131,27 @@ typedef struct _S_MIBS_PHS_RULE {
}S_MIBS_PHS_RULE;
typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
- UINT32 wmanIfSfid;
- UINT32 wmanIfCmnCpsSfState;
- UINT32 wmanIfCmnCpsMaxSustainedRate;
- UINT32 wmanIfCmnCpsMaxTrafficBurst;
- UINT32 wmanIfCmnCpsMinReservedRate;
- UINT32 wmanIfCmnCpsToleratedJitter;
- UINT32 wmanIfCmnCpsMaxLatency;
- UINT32 wmanIfCmnCpsFixedVsVariableSduInd;
- UINT32 wmanIfCmnCpsSduSize;
- UINT32 wmanIfCmnCpsSfSchedulingType;
- UINT32 wmanIfCmnCpsArqEnable;
- UINT32 wmanIfCmnCpsArqWindowSize;
- UINT32 wmanIfCmnCpsArqBlockLifetime;
- UINT32 wmanIfCmnCpsArqSyncLossTimeout;
- UINT32 wmanIfCmnCpsArqDeliverInOrder;
- UINT32 wmanIfCmnCpsArqRxPurgeTimeout;
- UINT32 wmanIfCmnCpsArqBlockSize;
- UINT32 wmanIfCmnCpsMinRsvdTolerableRate;
- UINT32 wmanIfCmnCpsReqTxPolicy;
- UINT32 wmanIfCmnSfCsSpecification;
- UINT32 wmanIfCmnCpsTargetSaid;
+ unsigned int wmanIfSfid;
+ unsigned int wmanIfCmnCpsSfState;
+ unsigned int wmanIfCmnCpsMaxSustainedRate;
+ unsigned int wmanIfCmnCpsMaxTrafficBurst;
+ unsigned int wmanIfCmnCpsMinReservedRate;
+ unsigned int wmanIfCmnCpsToleratedJitter;
+ unsigned int wmanIfCmnCpsMaxLatency;
+ unsigned int wmanIfCmnCpsFixedVsVariableSduInd;
+ unsigned int wmanIfCmnCpsSduSize;
+ unsigned int wmanIfCmnCpsSfSchedulingType;
+ unsigned int wmanIfCmnCpsArqEnable;
+ unsigned int wmanIfCmnCpsArqWindowSize;
+ unsigned int wmanIfCmnCpsArqBlockLifetime;
+ unsigned int wmanIfCmnCpsArqSyncLossTimeout;
+ unsigned int wmanIfCmnCpsArqDeliverInOrder;
+ unsigned int wmanIfCmnCpsArqRxPurgeTimeout;
+ unsigned int wmanIfCmnCpsArqBlockSize;
+ unsigned int wmanIfCmnCpsMinRsvdTolerableRate;
+ unsigned int wmanIfCmnCpsReqTxPolicy;
+ unsigned int wmanIfCmnSfCsSpecification;
+ unsigned int wmanIfCmnCpsTargetSaid;
}S_MIBS_EXTSERVICEFLOW_PARAMETERS;
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 7e12e02..6ea3f77 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -325,7 +325,7 @@ typedef struct _FLASH2X_BITMAP {
//for net entry time check
typedef struct _ST_TIME_ELAPSED_ {
unsigned long long ul64TimeElapsedSinceNetEntry;
- UINT32 uiReserved[4]; //By chance if required for future proofing
+ unsigned int uiReserved[4]; //By chance if required for future proofing
}ST_TIME_ELAPSED,*PST_TIME_ELAPSED;
enum {
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 25035a8..634605e 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -459,7 +459,7 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb)
unsigned char TcpHeaderLength;
pvEThPayload = skb->data;
- *((UINT32*) (skb->cb) +SKB_CB_TCPACK_OFFSET ) = 0;
+ *((unsigned int*)(skb->cb) + SKB_CB_TCPACK_OFFSET) = 0;
EThCSGetPktInfo(Adapter, pvEThPayload,&stEthCsPktInfo);
switch (stEthCsPktInfo.eNwpktEthFrameType) {
@@ -613,7 +613,7 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb)
pstClassifierRule->ulSFID);
//Store The matched Classifier in SKB
- *((UINT32*)(skb->cb)+SKB_CB_CLASSIFICATION_OFFSET) = pstClassifierRule->uiClassifierRuleIndex;
+ *((unsigned int*)(skb->cb) + SKB_CB_CLASSIFICATION_OFFSET) = pstClassifierRule->uiClassifierRuleIndex;
if ((TCP == pIpHeader->protocol ) && !bFragmentedPkt && (ETH_AND_IP_HEADER_LEN + TCP_HEADER_LEN <= skb->len) ) {
IpHeaderLength = pIpHeader->ihl;
pTcpHeader = (PTCP_HEADER)(((unsigned char *)pIpHeader)+(IpHeaderLength*4));
@@ -621,7 +621,7 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb)
if ((pTcpHeader->ucFlags & TCP_ACK) &&
(ntohs(pIpHeader->tot_len) == (IpHeaderLength*4)+(TcpHeaderLength*4))) {
- *((UINT32*) (skb->cb) +SKB_CB_TCPACK_OFFSET ) = TCP_ACK;
+ *((unsigned int*)(skb->cb) + SKB_CB_TCPACK_OFFSET) = TCP_ACK;
}
}
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index cda60c3..6bd30d4 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -101,7 +101,7 @@ int SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, unsigned short
}
/* Get the Classifier Rule ID */
- uiClassifierRuleID = *((UINT32*) (Packet->cb)+SKB_CB_CLASSIFICATION_OFFSET);
+ uiClassifierRuleID = *((unsigned int *)(Packet->cb) + SKB_CB_CLASSIFICATION_OFFSET);
bHeaderSupressionEnabled = Adapter->PackInfo[QueueIndex].bHeaderSuppressionEnabled
& Adapter->bPHSEnabled;
@@ -122,7 +122,7 @@ int SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, unsigned short
Leader.Vcid = Vcid;
- if (TCP_ACK == *((UINT32*) (Packet->cb) + SKB_CB_TCPACK_OFFSET ))
+ if (TCP_ACK == *((unsigned int *)(Packet->cb) + SKB_CB_TCPACK_OFFSET))
Leader.Status = LEADER_STATUS_TCP_ACK;
else
Leader.Status = LEADER_STATUS;
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index bb5022f..a9a5236 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -11,7 +11,6 @@
typedef char BOOLEAN;
-typedef unsigned int UINT32;
#ifndef NULL
#define NULL 0
#endif
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 64cfd38..a783503 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -87,8 +87,8 @@ int ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMib
pstHostMibs->stHostInfo.TimerActive = Adapter->TimerActive;
pstHostMibs->stHostInfo.u32TotalDSD = Adapter->u32TotalDSD;
- memcpy(pstHostMibs->stHostInfo.aTxPktSizeHist, Adapter->aTxPktSizeHist, sizeof(UINT32) * MIBS_MAX_HIST_ENTRIES);
- memcpy(pstHostMibs->stHostInfo.aRxPktSizeHist, Adapter->aRxPktSizeHist, sizeof(UINT32) * MIBS_MAX_HIST_ENTRIES);
+ memcpy(pstHostMibs->stHostInfo.aTxPktSizeHist, Adapter->aTxPktSizeHist, sizeof(unsigned int) * MIBS_MAX_HIST_ENTRIES);
+ memcpy(pstHostMibs->stHostInfo.aRxPktSizeHist, Adapter->aRxPktSizeHist, sizeof(unsigned int) * MIBS_MAX_HIST_ENTRIES);
return STATUS_SUCCESS;
}
--
1.7.8.111.gad25c.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
