[PATCH 16/34] staging: bcm: Convert typedef UCHAR to unsigned char

Joe Perches joe at perches.com
Tue Jan 10 16:54:10 UTC 2012


Use the normal types.
Remove now unused typedef.

Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/bcm/Adapter.h           |  104 +++++++++++++++---------------
 drivers/staging/bcm/Bcmchar.c           |    8 +-
 drivers/staging/bcm/CmHost.c            |   10 ++--
 drivers/staging/bcm/HostMIBSInterface.h |   34 +++++-----
 drivers/staging/bcm/IPv6Protocol.c      |   22 +++---
 drivers/staging/bcm/IPv6ProtocolHdr.h   |   50 +++++++--------
 drivers/staging/bcm/InterfaceAdapter.h  |   16 +++---
 drivers/staging/bcm/Ioctl.h             |   28 ++++----
 drivers/staging/bcm/Macros.h            |    6 +-
 drivers/staging/bcm/PHSModule.c         |    6 +-
 drivers/staging/bcm/PHSModule.h         |    6 +-
 drivers/staging/bcm/Protocol.h          |    6 +-
 drivers/staging/bcm/Prototypes.h        |    2 +-
 drivers/staging/bcm/Qos.c               |   18 +++---
 drivers/staging/bcm/Typedefs.h          |    1 -
 drivers/staging/bcm/led_control.c       |   38 ++++++------
 drivers/staging/bcm/led_control.h       |   12 ++--
 drivers/staging/bcm/nvm.c               |   14 ++--
 18 files changed, 189 insertions(+), 192 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 69ddc1e..e80475d 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -7,14 +7,14 @@
 struct _LEADER {
 	unsigned short	Vcid;
 	unsigned short	PLength;
-	UCHAR	Status;
-	UCHAR	Unused[3];
+	unsigned char	Status;
+	unsigned char	Unused[3];
 }__attribute__((packed));
 typedef struct _LEADER LEADER,*PLEADER;
 
 struct _PACKETTOSEND {
 	LEADER	Leader;
-	UCHAR	ucPayload;
+	unsigned char	ucPayload;
 }__attribute__((packed));
 typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;
 
@@ -29,7 +29,7 @@ typedef struct _CONTROL_PACKET CONTROL_PACKET,*PCONTROL_PACKET;
 
 struct link_request {
 	LEADER	Leader;
-	UCHAR	szData[4];
+	unsigned char	szData[4];
 }__attribute__((packed));
 typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
 
@@ -50,20 +50,20 @@ typedef struct _ADD_CONNECTION {
 	unsigned short	DestPortBegin;
 	unsigned short	DestPortEnd;
 
-	UCHAR		SrcTOS;
-	UCHAR		SrcProtocol;
+	unsigned char	SrcTOS;
+	unsigned char	SrcProtocol;
 } ADD_CONNECTION,*PADD_CONNECTION;
 
 
 typedef struct _CLASSIFICATION_RULE {
-	UCHAR		ucIPSrcAddrLen;
-	UCHAR       ucIPSrcAddr[32];
-	UCHAR		ucIPDestAddrLen;
-	UCHAR       ucIPDestAddr[32];
-	UCHAR		ucSrcPortRangeLen;
-	UCHAR		ucSrcPortRange[4];
-	UCHAR		ucDestPortRangeLen;
-	UCHAR		ucDestPortRange[4];
+	unsigned char	ucIPSrcAddrLen;
+	unsigned char	ucIPSrcAddr[32];
+	unsigned char	ucIPDestAddrLen;
+	unsigned char	ucIPDestAddr[32];
+	unsigned char	ucSrcPortRangeLen;
+	unsigned char	ucSrcPortRange[4];
+	unsigned char	ucDestPortRangeLen;
+	unsigned char	ucDestPortRange[4];
 	unsigned short	usVcid;
 } CLASSIFICATION_RULE,*PCLASSIFICATION_RULE;
 
@@ -74,7 +74,7 @@ typedef struct _CLASSIFICATION_ONLY {
 	unsigned short	usPortLo;
 	unsigned short	usPortHi;
 	BOOLEAN		bIpVersion;
-	UCHAR		ucDestinationAddress[16];
+	unsigned char	ucDestinationAddress[16];
 } CLASSIFICATION_ONLY, *PCLASSIFICATION_ONLY;
 
 
@@ -94,50 +94,50 @@ typedef union _U_IP_ADDRESS {
 
 	};
 	struct {
-		UCHAR	ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
-		UCHAR	ucIpv4Mask[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+		unsigned char	ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+		unsigned char	ucIpv4Mask[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
 	};
 	struct {
-		UCHAR	ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
-		UCHAR	ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
+		unsigned char	ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
+		unsigned char	ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
 	};
 }U_IP_ADDRESS;
 struct _packet_info;
 
 typedef struct _S_HDR_SUPRESSION_CONTEXTINFO {
 
-	UCHAR      ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; //Intermediate buffer to accumulate pkt Header for PHS
-	UCHAR      ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; //Intermediate buffer containing pkt Header after PHS
+	unsigned char	ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; //Intermediate buffer to accumulate pkt Header for PHS
+	unsigned char	ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; //Intermediate buffer containing pkt Header after PHS
 
 }S_HDR_SUPRESSION_CONTEXTINFO;
 
 
 typedef struct _S_CLASSIFIER_RULE {
 	ULONG			ulSFID;
-	UCHAR           ucReserved[2];
+	unsigned char	ucReserved[2];
 	B_UINT16        uiClassifierRuleIndex;
 	BOOLEAN			bUsed;
 	unsigned short	usVCID_Value;
 	B_UINT8         u8ClassifierRulePriority; //This field detemines the Classifier Priority
 	U_IP_ADDRESS	stSrcIpAddress;
-	UCHAR           ucIPSourceAddressLength;//Ip Source Address Length
+	unsigned char	ucIPSourceAddressLength;//Ip Source Address Length
 
 	U_IP_ADDRESS    stDestIpAddress;
-	UCHAR           ucIPDestinationAddressLength;//Ip Destination Address Length
-	UCHAR           ucIPTypeOfServiceLength;//Type of service Length
-	UCHAR           ucTosLow;//Tos Low
-	UCHAR           ucTosHigh;//Tos High
-	UCHAR           ucTosMask;//Tos Mask
-
-	UCHAR           ucProtocolLength;//protocol Length
-	UCHAR           ucProtocol[MAX_PROTOCOL_LENGTH];//protocol Length
+	unsigned char	ucIPDestinationAddressLength;//Ip Destination Address Length
+	unsigned char	ucIPTypeOfServiceLength;//Type of service Length
+	unsigned char	ucTosLow;//Tos Low
+	unsigned char	ucTosHigh;//Tos High
+	unsigned char	ucTosMask;//Tos Mask
+
+	unsigned char	ucProtocolLength;//protocol Length
+	unsigned char	ucProtocol[MAX_PROTOCOL_LENGTH];//protocol Length
 	unsigned short	usSrcPortRangeLo[MAX_PORT_RANGE];
 	unsigned short	usSrcPortRangeHi[MAX_PORT_RANGE];
-	UCHAR           ucSrcPortRangeLength;
+	unsigned char	ucSrcPortRangeLength;
 
 	unsigned short	usDestPortRangeLo[MAX_PORT_RANGE];
 	unsigned short	usDestPortRangeHi[MAX_PORT_RANGE];
-	UCHAR           ucDestPortRangeLength;
+	unsigned char	ucDestPortRangeLength;
 
 	BOOLEAN		bProtocolValid;
 	BOOLEAN		bTOSValid;
@@ -145,22 +145,22 @@ typedef struct _S_CLASSIFIER_RULE {
 	BOOLEAN		bSrcIpValid;
 
 	//For IPv6 Addressing
-	UCHAR		ucDirection;
+	unsigned char	ucDirection;
 	BOOLEAN         bIpv6Protocol;
 	UINT32          u32PHSRuleID;
 	S_PHS_RULE	sPhsRule;
-	UCHAR		u8AssociatedPHSI;
+	unsigned char	u8AssociatedPHSI;
 
 	//Classification fields for ETH CS
-	UCHAR		ucEthCSSrcMACLen;
-	UCHAR		au8EThCSSrcMAC[MAC_ADDRESS_SIZE];
-	UCHAR		au8EThCSSrcMACMask[MAC_ADDRESS_SIZE];
-	UCHAR		ucEthCSDestMACLen;
-	UCHAR		au8EThCSDestMAC[MAC_ADDRESS_SIZE];
-	UCHAR		au8EThCSDestMACMask[MAC_ADDRESS_SIZE];
-	UCHAR		ucEtherTypeLen;
-	UCHAR		au8EthCSEtherType[NUM_ETHERTYPE_BYTES];
-	UCHAR		usUserPriority[2];
+	unsigned char	ucEthCSSrcMACLen;
+	unsigned char	au8EThCSSrcMAC[MAC_ADDRESS_SIZE];
+	unsigned char	au8EThCSSrcMACMask[MAC_ADDRESS_SIZE];
+	unsigned char	ucEthCSDestMACLen;
+	unsigned char	au8EThCSDestMAC[MAC_ADDRESS_SIZE];
+	unsigned char	au8EThCSDestMACMask[MAC_ADDRESS_SIZE];
+	unsigned char	ucEtherTypeLen;
+	unsigned char	au8EthCSEtherType[NUM_ETHERTYPE_BYTES];
+	unsigned char	usUserPriority[2];
 	unsigned short	usVLANID;
 	unsigned short	usValidityBitMap;
 }S_CLASSIFIER_RULE;
@@ -203,7 +203,7 @@ struct _packet_info {
 	LARGE_INTEGER	liLastUpdateTokenAt;
 	UINT		uiMaxAllowedRate;
 	UINT		NumOfPacketsSent;
-	UCHAR		ucDirection;
+	unsigned char	ucDirection;
 	unsigned short	usCID;
 	S_MIBS_EXTSERVICEFLOW_PARAMETERS	stMibsExtServiceFlowTable;
 	UINT		uiCurrentRxRate;
@@ -211,7 +211,7 @@ struct _packet_info {
 	UINT		uiTotalRxBytes;
 	UINT		uiTotalTxBytes;
 	UINT		uiPendedLast;
-	UCHAR		ucIpVersion;
+	unsigned char	ucIpVersion;
 
 	union {
 		struct {
@@ -232,15 +232,15 @@ struct _packet_info {
 	BOOLEAN		bAdmittedSet;
 	BOOLEAN		bAuthorizedSet;
 	BOOLEAN		bClassifierPriority;
-	UCHAR		ucServiceClassName[MAX_CLASS_NAME_LENGTH];
+	unsigned char	ucServiceClassName[MAX_CLASS_NAME_LENGTH];
 	BOOLEAN     bHeaderSuppressionEnabled;
 	spinlock_t	SFQueueLock;
 	void		*pstSFIndication;
 	struct timeval	stLastUpdateTokenAt;
 	atomic_t	uiPerSFTxResourceCount;
 	UINT		uiMaxLatency;
-	UCHAR	bIPCSSupport;
-	UCHAR	bEthCSSupport;
+	unsigned char	bIPCSSupport;
+	unsigned char	bEthCSSupport;
 };
 typedef struct _packet_info PacketInfo;
 
@@ -399,7 +399,7 @@ struct _MINI_ADAPTER {
 
 	ULONG			    BEBucketSize;
 	ULONG			    rtPSBucketSize;
-	UCHAR			    LinkStatus;
+	unsigned char	LinkStatus;
 	BOOLEAN			    AutoLinkUp;
 	BOOLEAN			    AutoSyncup;
 
@@ -551,8 +551,8 @@ typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
 #define GET_BCM_ADAPTER(net_dev)	netdev_priv(net_dev)
 
 struct _ETH_HEADER_STRUC {
-	UCHAR       au8DestinationAddress[6];
-	UCHAR       au8SourceAddress[6];
+	unsigned char	au8DestinationAddress[6];
+	unsigned char	au8SourceAddress[6];
 	unsigned short	u16Etype;
 }__attribute__((packed));
 typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 58c2a58..3b400da 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -396,7 +396,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		break;
 	}
 	case IOCTL_BCM_GPIO_SET_REQUEST: {
-		UCHAR ucResetValue[4];
+		unsigned char ucResetValue[4];
 		UINT value = 0;
 		UINT uiBit = 0;
 		UINT uiOperation = 0;
@@ -530,7 +530,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 	case IOCTL_BCM_GPIO_STATUS_REQUEST: {
 		ULONG uiBit = 0;
-		UCHAR ucRead[4];
+		unsigned char ucRead[4];
 		GPIO_INFO   gpio_info = {0};
 
 		if ((Adapter->IdleMode == TRUE) ||
@@ -564,7 +564,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		break;
 
 	case IOCTL_BCM_GPIO_MULTI_REQUEST: {
-		UCHAR ucResetValue[4];
+		unsigned char ucResetValue[4];
 		GPIO_MULTI_INFO gpio_multi_info[MAX_IDX];
 		PGPIO_MULTI_INFO pgpio_multi_info = (PGPIO_MULTI_INFO)gpio_multi_info;
 
@@ -649,7 +649,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		break;
 
 	case IOCTL_BCM_GPIO_MODE_REQUEST: {
-		UCHAR ucResetValue[4];
+		unsigned char ucResetValue[4];
 		GPIO_MULTI_MODE gpio_multi_mode[MAX_IDX];
 		PGPIO_MULTI_MODE pgpio_multi_mode = (PGPIO_MULTI_MODE)gpio_multi_mode;
 
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 079934e..fdcac0c 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -115,8 +115,8 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 {
 	UINT	ucLoopIndex=0;
 	UINT    nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
-	UCHAR   *ptrClassifierIpAddress = NULL;
-	UCHAR   *ptrClassifierIpMask = NULL;
+	unsigned char *ptrClassifierIpAddress = NULL;
+	unsigned char *ptrClassifierIpMask = NULL;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	if (bIpVersion6) {
@@ -264,7 +264,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL
 	S_CLASSIFIER_RULE *pstClassifierEntry = NULL;
 	//VOID *pvPhsContext = NULL;
 	UINT	ucLoopIndex=0;
-	//UCHAR   ucProtocolLength=0;
+	//unsigned char   ucProtocolLength=0;
 	//ULONG   ulPhsStatus;
 
 
@@ -497,10 +497,10 @@ VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
 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 UCHAR ucDsxType,
+			   register unsigned char ucDsxType,
 			   stLocalSFAddIndicationAlt *pstAddIndication)
 {
-	//UCHAR   ucProtocolLength=0;
+	//unsigned char   ucProtocolLength=0;
 	ULONG	ulSFID;
 	UINT    nClassifierIndex = 0;
 	E_CLASSIFIER_ACTION eClassifierAction = eInvalidClassifierAction;
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 29be2ad..127c5f2 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -37,14 +37,14 @@ typedef union _U_MIBS_IP_ADDRESS {
 
 	};
 	struct {
-		UCHAR		ucIpv4Address[MIBS_MAX_IP_RANGE_LENGTH *
+		unsigned char	ucIpv4Address[MIBS_MAX_IP_RANGE_LENGTH *
 					      MIBS_IP_LENGTH_OF_ADDRESS];
-		UCHAR		ucIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH *
+		unsigned char	ucIpv4Mask[MIBS_MAX_IP_RANGE_LENGTH *
 					   MIBS_IP_LENGTH_OF_ADDRESS];
 	};
 	struct {
-		UCHAR		ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
-		UCHAR		ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
+		unsigned char	ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
+		unsigned char	ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
 	};
 }U_MIBS_IP_ADDRESS;
 
@@ -73,7 +73,7 @@ typedef struct _S_MIBS_HOST_INFO {
 
 typedef struct _S_MIBS_CLASSIFIER_RULE {
 	ULONG				ulSFID;
-	UCHAR               ucReserved[2];
+	unsigned char	ucReserved[2];
 	B_UINT16            uiClassifierRuleIndex;
 	BOOLEAN				bUsed;
 	unsigned short	usVCID_Value;
@@ -81,28 +81,28 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
 	B_UINT8             u8ClassifierRulePriority;
 	U_MIBS_IP_ADDRESS   stSrcIpAddress;
 	/*IP Source Address Length*/
-	UCHAR               ucIPSourceAddressLength;
+	unsigned char	ucIPSourceAddressLength;
 
 	U_MIBS_IP_ADDRESS   stDestIpAddress;
 	/* IP Destination Address Length */
-	UCHAR               ucIPDestinationAddressLength;
-	UCHAR               ucIPTypeOfServiceLength;//Type of service Length
-	UCHAR               ucTosLow;//Tos Low
-	UCHAR               ucTosHigh;//Tos High
-	UCHAR               ucTosMask;//Tos Mask
-	UCHAR               ucProtocolLength;//protocol Length
-	UCHAR               ucProtocol[MIBS_MAX_PROTOCOL_LENGTH];//protocol Length
+	unsigned char	ucIPDestinationAddressLength;
+	unsigned char	ucIPTypeOfServiceLength;//Type of service Length
+	unsigned char	ucTosLow;//Tos Low
+	unsigned char	ucTosHigh;//Tos High
+	unsigned char	ucTosMask;//Tos Mask
+	unsigned char	ucProtocolLength;//protocol Length
+	unsigned char	ucProtocol[MIBS_MAX_PROTOCOL_LENGTH];//protocol Length
 	unsigned short	usSrcPortRangeLo[MIBS_MAX_PORT_RANGE];
 	unsigned short	usSrcPortRangeHi[MIBS_MAX_PORT_RANGE];
-	UCHAR               ucSrcPortRangeLength;
+	unsigned char	ucSrcPortRangeLength;
 	unsigned short	usDestPortRangeLo[MIBS_MAX_PORT_RANGE];
 	unsigned short	usDestPortRangeHi[MIBS_MAX_PORT_RANGE];
-	UCHAR               ucDestPortRangeLength;
+	unsigned char	ucDestPortRangeLength;
 	BOOLEAN				bProtocolValid;
 	BOOLEAN				bTOSValid;
 	BOOLEAN				bDestIpValid;
 	BOOLEAN				bSrcIpValid;
-	UCHAR				ucDirection;
+	unsigned char	ucDirection;
 	BOOLEAN             bIpv6Protocol;
 	UINT32              u32PHSRuleID;
 }S_MIBS_CLASSIFIER_RULE;
@@ -185,7 +185,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
 	LARGE_INTEGER	liLastUpdateTokenAt;
 	UINT		uiMaxAllowedRate;
 	UINT        NumOfPacketsSent;
-	UCHAR		ucDirection;
+	unsigned char	ucDirection;
 	unsigned short	usCID;
 	S_MIBS_EXTSERVICEFLOW_PARAMETERS	stMibsExtServiceFlowTable;
 	UINT		uiCurrentRxRate;
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index b218d37..c70c30b 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -4,10 +4,10 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Hea
 static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule, IPV6Header *pstIpv6Header);
 static VOID DumpIpv6Header(IPV6Header *pstIpv6Header);
 
-static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload, UCHAR *pucNextHeader, BOOLEAN *bParseDone, unsigned short *pusPayloadLength)
+static unsigned char * GetNextIPV6ChainedHeader(unsigned char **ppucPayload, unsigned char *pucNextHeader, BOOLEAN *bParseDone, unsigned short *pusPayloadLength)
 {
-	UCHAR *pucRetHeaderPtr = NULL;
-	UCHAR *pucPayloadPtr = NULL;
+	unsigned char *pucRetHeaderPtr = NULL;
+	unsigned char *pucPayloadPtr = NULL;
 	unsigned short	usNextHeaderOffset = 0;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
@@ -124,12 +124,12 @@ static UCHAR * GetNextIPV6ChainedHeader(UCHAR **ppucPayload, UCHAR *pucNextHeade
 }
 
 
-static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload, unsigned short *pusSrcPort, unsigned short *pusDestPort, unsigned short usPayloadLength, UCHAR ucNextHeader)
+static unsigned char GetIpv6ProtocolPorts(unsigned char *pucPayload, unsigned short *pusSrcPort, unsigned short *pusDestPort, unsigned short usPayloadLength, unsigned char ucNextHeader)
 {
-	UCHAR *pIpv6HdrScanContext = pucPayload;
+	unsigned char *pIpv6HdrScanContext = pucPayload;
 	BOOLEAN bDone = FALSE;
-	UCHAR ucHeaderType =0;
-	UCHAR *pucNextHeader = NULL;
+	unsigned char ucHeaderType = 0;
+	unsigned char *pucNextHeader = NULL;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	if ( !pucPayload || (usPayloadLength == 0)) {
@@ -164,7 +164,7 @@ unsigned short	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver cont
 {
 	unsigned short	ushDestPort = 0;
 	unsigned short	ushSrcPort = 0;
-	UCHAR   ucNextProtocolAboveIP =0;
+	unsigned char	ucNextProtocolAboveIP = 0;
 	IPV6Header *pstIpv6Header = NULL;
 	BOOLEAN bClassificationSucceed = FALSE;
 
@@ -175,7 +175,7 @@ unsigned short	IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver cont
 	DumpIpv6Header(pstIpv6Header);
 
 	//Try to get the next higher layer protocol and the Ports Nos if TCP or UDP
-	ucNextProtocolAboveIP = GetIpv6ProtocolPorts((UCHAR *)(pcIpHeader + sizeof(IPV6Header)),
+	ucNextProtocolAboveIP = GetIpv6ProtocolPorts((unsigned char *)(pcIpHeader + sizeof(IPV6Header)),
 						     &ushSrcPort,
 						     &ushDestPort,
 						     pstIpv6Header->usPayloadLength,
@@ -366,8 +366,8 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
 
 static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
 {
-	UCHAR ucVersion;
-	UCHAR  ucPrio ;
+	unsigned char ucVersion;
+	unsigned char  ucPrio;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "----Ipv6 Header---\n");
 	ucVersion = pstIpv6Header->ucVersionPrio & 0xf0;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 7841918..9786722 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -23,64 +23,62 @@
 */
 #define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8
 
-//typedef  unsigned char UCHAR;
-//typedef  unsigned short unsigned short;
 //typedef  unsigned long int ULONG;
 
 typedef struct IPV6HeaderFormatTag {
-	UCHAR  ucVersionPrio;
-	UCHAR  aucFlowLabel[3];
+	unsigned char  ucVersionPrio;
+	unsigned char  aucFlowLabel[3];
 	unsigned short usPayloadLength;
-	UCHAR  ucNextHeader;
-	UCHAR  ucHopLimit;
+	unsigned char  ucNextHeader;
+	unsigned char  ucHopLimit;
 	ULONG  ulSrcIpAddress[4];
 	ULONG  ulDestIpAddress[4];
 }IPV6Header;
 
 typedef struct IPV6RoutingHeaderFormatTag {
-	UCHAR ucNextHeader;
-	UCHAR ucRoutingType;
-	UCHAR ucNumAddresses;
-	UCHAR ucNextAddress;
+	unsigned char ucNextHeader;
+	unsigned char ucRoutingType;
+	unsigned char ucNumAddresses;
+	unsigned char ucNextAddress;
 	ULONG ulReserved;
-	//UCHAR aucAddressList[0];
+	//unsigned char aucAddressList[0];
 
 }IPV6RoutingHeader;
 
 typedef struct IPV6FragmentHeaderFormatTag {
-	UCHAR ucNextHeader;
-	UCHAR ucReserved;
+	unsigned char ucNextHeader;
+	unsigned char ucReserved;
 	unsigned short usFragmentOffset;
 	ULONG  ulIdentification;
 }IPV6FragmentHeader;
 
 typedef struct IPV6DestOptionsHeaderFormatTag {
-	UCHAR ucNextHeader;
-	UCHAR ucHdrExtLen;
-	UCHAR ucDestOptions[6];
-	//UCHAR udExtDestOptions[0];
+	unsigned char ucNextHeader;
+	unsigned char ucHdrExtLen;
+	unsigned char ucDestOptions[6];
+	//unsigned char udExtDestOptions[0];
 }IPV6DestOptionsHeader;
 
 typedef struct IPV6HopByHopOptionsHeaderFormatTag {
-	UCHAR ucNextHeader;
-	UCHAR ucMisc[3];
+	unsigned char ucNextHeader;
+	unsigned char ucMisc[3];
 	ULONG ulJumboPayloadLen;
 }IPV6HopByHopOptionsHeader;
 
 typedef struct IPV6AuthenticationHeaderFormatTag {
-	UCHAR ucNextHeader;
-	UCHAR ucLength;
+	unsigned char ucNextHeader;
+	unsigned char ucLength;
 	unsigned short usReserved;
 	ULONG  ulSecurityParametersIndex;
-	//UCHAR  ucAuthenticationData[0];
+	//unsigned char  ucAuthenticationData[0];
 
 }IPV6AuthenticationHeader;
 
 typedef struct IPV6IcmpHeaderFormatTag {
-	UCHAR ucType;
-	UCHAR ucCode;
+	unsigned char ucType;
+	unsigned char ucCode;
 	unsigned short usChecksum;
-	//UCHAR  ucIcmpMsg[0];
+	//unsigned char  ucIcmpMsg[0];
 
 }IPV6IcmpHeader;
 
@@ -103,7 +101,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address);
 
 extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort);
 extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort);
-extern BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucProtocol);
+extern BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, unsigned char ucProtocol);
 
 
 #endif
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index e48bb59..4c4ad4a 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -4,33 +4,33 @@
 typedef struct _BULK_ENDP_IN {
 	char *bulk_in_buffer;
 	size_t          bulk_in_size;
-	UCHAR			bulk_in_endpointAddr;
+	unsigned char bulk_in_endpointAddr;
 	UINT bulk_in_pipe;
 }BULK_ENDP_IN, *PBULK_ENDP_IN;
 
 
 typedef struct _BULK_ENDP_OUT {
-	UCHAR			bulk_out_buffer;
+	unsigned char bulk_out_buffer;
 	size_t          bulk_out_size;
-	UCHAR			bulk_out_endpointAddr;
+	unsigned char bulk_out_endpointAddr;
 	UINT bulk_out_pipe;
 	//this is used when int out endpoint is used as bulk out end point
-	UCHAR			int_out_interval;
+	unsigned char int_out_interval;
 }BULK_ENDP_OUT, *PBULK_ENDP_OUT;
 
 typedef struct _INTR_ENDP_IN {
 	char *int_in_buffer;
 	size_t          int_in_size;
-	UCHAR			int_in_endpointAddr;
-	UCHAR			int_in_interval;
+	unsigned char int_in_endpointAddr;
+	unsigned char int_in_interval;
 	UINT int_in_pipe;
 }INTR_ENDP_IN, *PINTR_ENDP_IN;
 
 typedef struct _INTR_ENDP_OUT {
 	char *int_out_buffer;
 	size_t          int_out_size;
-	UCHAR			int_out_endpointAddr;
-	UCHAR			int_out_interval;
+	unsigned char int_out_endpointAddr;
+	unsigned char int_out_interval;
 	UINT int_out_pipe;
 }INTR_ENDP_OUT, *PINTR_ENDP_OUT;
 
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 7146786..fd7e21a 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -10,7 +10,7 @@ typedef struct rdmbuffer {
 typedef struct wrmbuffer {
 	ULONG	Register;
 	ULONG	Length;
-	UCHAR	Data[4];
+	unsigned char	Data[4];
 }__attribute__((packed)) WRM_BUFFER, *PWRM_BUFFER;
 
 
@@ -306,20 +306,20 @@ typedef enum _SECTION_TYPE
  */
 
 typedef struct _FLASH2X_BITMAP {
-	UCHAR ISO_IMAGE1;
-	UCHAR ISO_IMAGE2;
-	UCHAR DSD0;
-	UCHAR DSD1;
-	UCHAR DSD2;
-	UCHAR VSA0;
-	UCHAR VSA1;
-	UCHAR VSA2;
-	UCHAR SCSI;
-	UCHAR CONTROL_SECTION;
+	unsigned char ISO_IMAGE1;
+	unsigned char ISO_IMAGE2;
+	unsigned char DSD0;
+	unsigned char DSD1;
+	unsigned char DSD2;
+	unsigned char VSA0;
+	unsigned char VSA1;
+	unsigned char VSA2;
+	unsigned char SCSI;
+	unsigned char CONTROL_SECTION;
 	//Reserved for future use
-	UCHAR Reserved0;
-	UCHAR Reserved1;
-	UCHAR Reserved2;
+	unsigned char Reserved0;
+	unsigned char Reserved1;
+	unsigned char Reserved2;
 }FLASH2X_BITMAP, *PFLASH2X_BITMAP;
 
 //for net entry time check
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 3393b46..c1aeafe 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -165,9 +165,9 @@
 
 
 typedef struct _LINK_STATE {
-	UCHAR ucLinkStatus;
-	UCHAR bIdleMode;
-	UCHAR bShutdownMode;
+	unsigned char ucLinkStatus;
+	unsigned char bIdleMode;
+	unsigned char bShutdownMode;
 } LINK_STATE, *PLINK_STATE;
 
 
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 2960937..636698d 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -75,7 +75,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 		B_UINT16 uiClassifierRuleID,
 		BOOLEAN bHeaderSuppressionEnabled,
 		UINT *PacketLen,
-		UCHAR bEthCSSupport)
+		unsigned char bEthCSSupport)
 {
 
 	//PHS Sepcific
@@ -205,7 +205,7 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 	       unsigned short usVcid,
 	       struct sk_buff *packet,
 	       UINT *punPacketLen,
-	       UCHAR *pucEthernetHdr,
+	       unsigned char *pucEthernetHdr,
 	       UINT	bHeaderSuppressionEnabled)
 {
 	u32   nStandardPktHdrLen		= 0;
@@ -258,7 +258,7 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 	return STATUS_SUCCESS;
 }
 
-void DumpFullPacket(UCHAR *pBuf, UINT nPktLen)
+void DumpFullPacket(unsigned char *pBuf, UINT nPktLen)
 {
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Dumping Data Packet\n");
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index 8eff7f2..63775c3 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -7,20 +7,20 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 		B_UINT16 uiClassifierRuleID,
 		BOOLEAN bHeaderSuppressionEnabled,
 		PUINT PacketLen,
-		UCHAR bEthCSSupport);
+		unsigned char bEthCSSupport);
 
 int PHSReceive(PMINI_ADAPTER Adapter,
 	       unsigned short usVcid,
 	       struct sk_buff *packet,
 	       UINT *punPacketLen,
-	       UCHAR *pucEthernetHdr,
+	       unsigned char *pucEthernetHdr,
 	       UINT
 	);
 
 
 void DumpDataPacketHeader(PUCHAR pPkt);
 
-void DumpFullPacket(UCHAR *pBuf, UINT nPktLen);
+void DumpFullPacket(unsigned char *pBuf, UINT nPktLen);
 
 void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
 
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index 0592ca9..f399c06 100644
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -47,7 +47,7 @@ typedef struct _S_ETHCS_PKT_INFO {
 	E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
 	E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
 	unsigned short	usEtherType;
-	UCHAR	ucDSAP;
+	unsigned char	ucDSAP;
 }S_ETHCS_PKT_INFO,*PS_ETHCS_PKT_INFO;
 
 typedef struct _ETH_CS_802_Q_FRAME {
@@ -129,8 +129,8 @@ typedef struct _TCP_HEADER {
 	unsigned short usDestPort;
 	ULONG  ulSeqNumber;
 	ULONG  ulAckNumber;
-	UCHAR  HeaderLength;
-	UCHAR  ucFlags;
+	unsigned char  HeaderLength;
+	unsigned char  ucFlags;
 	unsigned short usWindowsSize;
 	unsigned short usChkSum;
 	unsigned short usUrgetPtr;
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 05e8087..a255a82 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -35,7 +35,7 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb);
 
 BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort);
 BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort);
-BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucProtocol);
+BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, unsigned char ucProtocol);
 
 
 int SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 825a71b..88f615f 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -26,7 +26,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, int iIndex);
  *********************************************************************/
 BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulSrcIP)
 {
-	UCHAR	ucLoopIndex=0;
+	unsigned char	ucLoopIndex=0;
 
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
@@ -62,7 +62,7 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulSrcIP)
  *********************************************************************/
 BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulDestIP)
 {
-	UCHAR	ucLoopIndex=0;
+	unsigned char	ucLoopIndex = 0;
 	PMINI_ADAPTER	Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	ulDestIP=ntohl(ulDestIP);
@@ -96,7 +96,7 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule, ULONG ulDestIP)
  *
  * Returns     - TRUE(If address matches) else FAIL.
  **************************************************************************/
-BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucTypeOfService)
+BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule, unsigned char ucTypeOfService)
 {
 
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -121,9 +121,9 @@ BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucTypeOfService)
  *
  * Returns     - TRUE(If address matches) else FAIL.
  ****************************************************************************/
-BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucProtocol)
+BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, unsigned char ucProtocol)
 {
-	UCHAR	ucLoopIndex=0;
+	unsigned char ucLoopIndex = 0;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if (0 == pstClassifierRule->ucProtocolLength)
 		return TRUE;
@@ -152,7 +152,7 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucProtocol)
  ***************************************************************************/
 BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrcPort)
 {
-	UCHAR	ucLoopIndex=0;
+	unsigned char ucLoopIndex = 0;
 
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
@@ -183,7 +183,7 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushSrc
  ***************************************************************************/
 BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule, unsigned short ushDestPort)
 {
-	UCHAR	ucLoopIndex=0;
+	unsigned char	ucLoopIndex=0;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	if (0 == pstClassifierRule->ucDestPortRangeLength)
@@ -455,8 +455,8 @@ unsigned short ClassifyPacket(PMINI_ADAPTER Adapter, struct sk_buff* skb)
 	unsigned short	usCurrFragment = 0;
 
 	PTCP_HEADER pTcpHeader;
-	UCHAR IpHeaderLength;
-	UCHAR TcpHeaderLength;
+	unsigned char IpHeaderLength;
+	unsigned char TcpHeaderLength;
 
 	pvEThPayload = skb->data;
 	*((UINT32*) (skb->cb) +SKB_CB_TCPACK_OFFSET ) = 0;
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index ee65c97..4a5b556 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -13,7 +13,6 @@ typedef char BOOLEAN;
 typedef long LONG;
 typedef void VOID;
 
-typedef unsigned char UCHAR;
 typedef unsigned char B_UINT8;
 typedef unsigned short B_UINT16;
 typedef unsigned int UINT;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 33ba506..6e2509a 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -23,7 +23,7 @@ BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios)
 		return TRUE;
 }
 
-static int LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
+static int LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, unsigned char uiLedIndex,
 		     ULONG timeout, int num_of_time, LedEventInfo_t currdriverstate)
 {
 	int Status = STATUS_SUCCESS;
@@ -94,8 +94,8 @@ static int ScaleRateofTransfer(ULONG rate)
 
 
 
-static int LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
-				  UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
+static int LED_Proportional_Blink(PMINI_ADAPTER Adapter, unsigned char GPIO_Num_tx,
+				  unsigned char uiTxLedIndex, unsigned char GPIO_Num_rx, unsigned char uiRxLedIndex,
 				  LedEventInfo_t currdriverstate)
 {
 	/* Initial values of TX and RX packets */
@@ -366,15 +366,15 @@ static int ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset)
 } /* ValidateHWParmStructure() */
 
 static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
-					UCHAR GPIO_Array[])
+					unsigned char GPIO_Array[])
 {
 	int Status = STATUS_SUCCESS;
 
 	ULONG  dwReadValue	= 0;
 	unsigned short usHwParamData	= 0;
 	unsigned short usEEPROMVersion	= 0;
-	UCHAR  ucIndex		= 0;
-	UCHAR  ucGPIOInfo[32]	= {0};
+	unsigned char  ucIndex		= 0;
+	unsigned char  ucGPIOInfo[32]	= {0};
 
 	BeceemNVMRead(Adapter, (PUINT)&usEEPROMVersion,
 		      EEPROM_VERSION_OFFSET, 2);
@@ -477,11 +477,11 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
 {
 	int Status = STATUS_SUCCESS;
 	/* Array to store GPIO numbers from EEPROM */
-	UCHAR GPIO_Array[NUM_OF_LEDS+1];
+	unsigned char GPIO_Array[NUM_OF_LEDS+1];
 	UINT uiIndex = 0;
 	UINT uiNum_of_LED_Type = 0;
 	PUCHAR puCFGData	= NULL;
-	UCHAR bData = 0;
+	unsigned char bData = 0;
 	memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);
 
 	if (!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams)) {
@@ -600,8 +600,8 @@ static VOID LedGpioInit(PMINI_ADAPTER Adapter)
 	Adapter->LEDInfo.bIdle_led_off = FALSE;
 }
 
-static int BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
-			     UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
+static int BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, unsigned char *GPIO_num_tx,
+			     unsigned char *GPIO_num_rx, unsigned char *uiLedTxIndex, unsigned char *uiLedRxIndex,
 			     LedEventInfo_t currdriverstate)
 {
 	UINT uiIndex = 0;
@@ -643,16 +643,16 @@ static int BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
 static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 {
 	UINT uiIndex = 0;
-	UCHAR GPIO_num = 0;
-	UCHAR uiLedIndex = 0;
+	unsigned char GPIO_num = 0;
+	unsigned char uiLedIndex = 0;
 	UINT uiResetValue = 0;
 	LedEventInfo_t currdriverstate = 0;
 	ulong timeout = 0;
 
 	int Status = 0;
 
-	UCHAR dummyGPIONum = 0;
-	UCHAR dummyIndex = 0;
+	unsigned char dummyGPIONum = 0;
+	unsigned char dummyIndex = 0;
 
 	/* currdriverstate = Adapter->DriverState; */
 	Adapter->LEDInfo.bIdleMode_tx_from_host = FALSE;
@@ -744,10 +744,10 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 				TURN_ON_LED(1 << GPIO_num, uiLedIndex);
 			break;
 		case NORMAL_OPERATION: {
-			UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
-			UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
-			UCHAR uiLEDTx = 0;
-			UCHAR uiLEDRx = 0;
+			unsigned char GPIO_num_tx = DISABLE_GPIO_NUM;
+			unsigned char GPIO_num_rx = DISABLE_GPIO_NUM;
+			unsigned char uiLEDTx = 0;
+			unsigned char uiLEDRx = 0;
 			currdriverstate = NORMAL_OPERATION;
 			Adapter->LEDInfo.bIdle_led_off = FALSE;
 
@@ -853,7 +853,7 @@ int InitLedSettings(PMINI_ADAPTER Adapter)
 {
 	int Status = STATUS_SUCCESS;
 	BOOLEAN bEnableThread = TRUE;
-	UCHAR uiIndex = 0;
+	unsigned char uiIndex = 0;
 
 	/*
 	 * Initially set BitPolarity to normal polarity. The bit 8 of LED type
diff --git a/drivers/staging/bcm/led_control.h b/drivers/staging/bcm/led_control.h
index 51b5c35e..608d29e 100644
--- a/drivers/staging/bcm/led_control.h
+++ b/drivers/staging/bcm/led_control.h
@@ -72,12 +72,12 @@ typedef enum LedEvents {
 /*Structure which stores the information of different LED types
  *  and corresponding LED state information of driver states*/
 typedef struct LedStateInfo_t {
-	UCHAR LED_Type; /* specify GPIO number - use 0xFF if not used */
-	UCHAR LED_On_State; /* Bits set or reset for different states */
-	UCHAR LED_Blink_State; /* Bits set or reset for blinking LEDs for different states */
-	UCHAR GPIO_Num;
-	UCHAR			BitPolarity;				/*To represent whether H/W is normal polarity or reverse
-									  polarity*/
+	unsigned char LED_Type; /* specify GPIO number - use 0xFF if not used */
+	unsigned char LED_On_State; /* Bits set or reset for different states */
+	unsigned char LED_Blink_State; /* Bits set or reset for blinking LEDs for different states */
+	unsigned char GPIO_Num;
+	unsigned char BitPolarity; /* To represent whether H/W is
+				    * normal polarity or reverse polarity */
 }LEDStateInfo, *pLEDStateInfo;
 
 
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 4fdba1c..753ec50 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -62,9 +62,9 @@ static int ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter, UINT dwAddress, UINT *pdw
 //
 //-----------------------------------------------------------------------------
 
-static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
+static unsigned char ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
 {
-	UCHAR uiData = 0;
+	unsigned char uiData = 0;
 	DWORD dwRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
 	UINT uiStatus = 0;
 	UINT value = 0;
@@ -91,7 +91,7 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
 
 			value =0;
 			rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &value, sizeof(value));
-			uiData = (UCHAR)value;
+			uiData = (unsigned char)value;
 
 			break;
 		}
@@ -137,7 +137,7 @@ int ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
 	UINT uiStatus  = 0;
 	UINT value= 0;
 	UINT value1 = 0;
-	UCHAR *pvalue;
+	unsigned char *pvalue;
 
 	/* Flush the read and cmd queue. */
 	value=( EEPROM_READ_QUEUE_FLUSH | EEPROM_CMD_QUEUE_FLUSH );
@@ -1084,7 +1084,7 @@ static int BeceemFlashBulkWrite(
 	UINT  uiCurrSectOffsetAddr	= 0;
 	UINT  uiSectBoundary		= 0;
 	UINT  uiNumSectTobeRead	= 0;
-	UCHAR ucReadBk[16]	= {0};
+	unsigned char ucReadBk[16]	= {0};
 	ULONG ulStatus              = 0;
 	int Status = STATUS_SUCCESS;
 	UINT uiTemp				= 0;
@@ -1298,7 +1298,7 @@ static int BeceemFlashBulkWriteStatus(
 	UINT  uiCurrSectOffsetAddr	= 0;
 	UINT  uiSectBoundary		= 0;
 	UINT  uiNumSectTobeRead	= 0;
-	UCHAR ucReadBk[16]			= {0};
+	unsigned char ucReadBk[16]	= {0};
 	ULONG ulStatus              = 0;
 	UINT  Status				= STATUS_SUCCESS;
 	UINT uiTemp				= 0;
@@ -1682,7 +1682,7 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
 {
 	UINT uiRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
 	UINT uiStatus = 0;
-	UCHAR uiEpromStatus = 0;
+	unsigned char uiEpromStatus = 0;
 	UINT value =0 ;
 
 	/* Flush the Write/Read/Cmd queues. */
-- 
1.7.8.111.gad25c.dirty




More information about the devel mailing list