[PATCH 00/11 V2] Staging: bcm: Cleanup Adapter.h

[PATCH 00/11 V2] Staging: bcm: Cleanup Adapter.h

[Kevin McKinney]

These patches fix several issues in Adapter.h

Kevin McKinney (11):
  Staging: bcm: Fix WARNING: space prohibited before semicolon.
  Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.
  Staging: bcm: Replace USHORT with unsigned short in Adapter.h
  Staging: bcm: Replaces UCHAR with u8 in Adapter.h
  Staging: bcm: Replace ULONG with unsigned long or u32 in Adapter.h
  Staging: bcm: Replace B_UINT16 with u16 in Adapter.h
  Staging: bcm: Replace B_UINT8 with u8 in Adapter.h
  Staging: bcm: Replace UINT32 with u32 in Adapter.h
  Staging: bcm: Replace UINT with unsigned int in Adapter.h
  Staging: bcm: Replace PVOID with void * in Adapter.h
  Staging: bcm: Replace LARGE_INTEGER with u64 in Adapter.h

 drivers/staging/bcm/Adapter.h |  298 ++++++++++++++++++++---------------------
 drivers/staging/bcm/Bcmchar.c |    2 +-
 drivers/staging/bcm/CmHost.c  |    8 +-
 drivers/staging/bcm/Misc.c    |    8 +-
 4 files changed, 158 insertions(+), 158 deletions(-)

-- 
1.7.9.5

[PATCH 01/11 V2] Staging: bcm: Fix WARNING: space prohibited before semicolon.

[Kevin McKinney]

This patch removes a space before semicolon as
specified by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index d6c9630..11fd7f1 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -267,7 +267,7 @@ struct bcm_mini_adapter {
 	bool			fw_download_done;
 
 	char			*txctlpacket[MAX_CNTRL_PKTS];
-	atomic_t		cntrlpktCnt ;
+	atomic_t		cntrlpktCnt;
 	atomic_t		index_app_read_cntrlpkt;
 	atomic_t		index_wr_txcntrlpkt;
 	atomic_t		index_rd_txcntrlpkt;
-- 
1.7.9.5

[PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

[Kevin McKinney]

This patch removes typedef for _U_IP_ADDRESS, and
changes the name of the struct to bcm_ip_address. In
addition, any calls to struct "U_IP_ADDRESS" are
changed to call directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 11fd7f1..33b5063 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -35,7 +35,7 @@ struct bcm_link_request {
 #define MAX_PROTOCOL_LENGTH   32
 #define IPV6_ADDRESS_SIZEINBYTES 0x10
 
-typedef union _U_IP_ADDRESS {
+union bcm_ip_address {
 	struct {
 		ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address Range */
 		ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */
@@ -52,7 +52,7 @@ typedef union _U_IP_ADDRESS {
 		UCHAR ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
 		UCHAR ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
 	};
-} U_IP_ADDRESS;
+};
 
 struct bcm_hdr_suppression_contextinfo {
 	UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
@@ -66,10 +66,10 @@ struct bcm_classifier_rule {
 	bool		bUsed;
 	USHORT		usVCID_Value;
 	B_UINT8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
-	U_IP_ADDRESS	stSrcIpAddress;
+	union bcm_ip_address stSrcIpAddress;
 	UCHAR		ucIPSourceAddressLength; /* Ip Source Address Length */
 
-	U_IP_ADDRESS	stDestIpAddress;
+	union bcm_ip_address stDestIpAddress;
 	UCHAR		ucIPDestinationAddressLength; /* Ip Destination Address Length */
 	UCHAR		ucIPTypeOfServiceLength; /* Type of service Length */
 	UCHAR		ucTosLow; /* Tos Low */
-- 
1.7.9.5

[PATCH 03/11 V2] Staging: bcm: Replace USHORT with unsigned short in Adapter.h

[Kevin McKinney]

This patch replaces "USHORT" with "unsigned
short" in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 33b5063..08bd9fc 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -8,8 +8,8 @@
 #include "Debug.h"
 
 struct bcm_leader {
-	USHORT	Vcid;
-	USHORT	PLength;
+	unsigned short Vcid;
+	unsigned short PLength;
 	UCHAR	Status;
 	UCHAR	Unused[3];
 } __packed;
@@ -64,7 +64,7 @@ struct bcm_classifier_rule {
 	UCHAR		ucReserved[2];
 	B_UINT16	uiClassifierRuleIndex;
 	bool		bUsed;
-	USHORT		usVCID_Value;
+	unsigned short	usVCID_Value;
 	B_UINT8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
 	union bcm_ip_address stSrcIpAddress;
 	UCHAR		ucIPSourceAddressLength; /* Ip Source Address Length */
@@ -78,12 +78,12 @@ struct bcm_classifier_rule {
 
 	UCHAR		ucProtocolLength; /* protocol Length */
 	UCHAR		ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
-	USHORT		usSrcPortRangeLo[MAX_PORT_RANGE];
-	USHORT		usSrcPortRangeHi[MAX_PORT_RANGE];
+	unsigned short	usSrcPortRangeLo[MAX_PORT_RANGE];
+	unsigned short	usSrcPortRangeHi[MAX_PORT_RANGE];
 	UCHAR		ucSrcPortRangeLength;
 
-	USHORT		usDestPortRangeLo[MAX_PORT_RANGE];
-	USHORT		usDestPortRangeHi[MAX_PORT_RANGE];
+	unsigned short	usDestPortRangeLo[MAX_PORT_RANGE];
+	unsigned short	usDestPortRangeHi[MAX_PORT_RANGE];
 	UCHAR		ucDestPortRangeLength;
 
 	bool		bProtocolValid;
@@ -108,14 +108,14 @@ struct bcm_classifier_rule {
 	UCHAR		ucEtherTypeLen;
 	UCHAR		au8EthCSEtherType[NUM_ETHERTYPE_BYTES];
 	UCHAR		usUserPriority[2];
-	USHORT		usVLANID;
-	USHORT		usValidityBitMap;
+	unsigned short	usVLANID;
+	unsigned short	usValidityBitMap;
 };
 
 struct bcm_fragmented_packet_info {
 	bool			bUsed;
 	ULONG			ulSrcIpAddress;
-	USHORT			usIpIdentification;
+	unsigned short		usIpIdentification;
 	struct bcm_classifier_rule *pstMatchedClassifierEntry;
 	bool			bOutOfOrderFragment;
 };
@@ -123,7 +123,7 @@ struct bcm_fragmented_packet_info {
 struct bcm_packet_info {
 	/* classification extension Rule */
 	ULONG		ulSFID;
-	USHORT		usVCID_Value;
+	unsigned short	usVCID_Value;
 	UINT		uiThreshold;
 	/* This field determines the priority of the SF Queues */
 	B_UINT8		u8TrafficPriority;
@@ -150,7 +150,7 @@ struct bcm_packet_info {
 	UINT		uiMaxAllowedRate;
 	UINT		NumOfPacketsSent;
 	UCHAR		ucDirection;
-	USHORT		usCID;
+	unsigned short	usCID;
 	struct bcm_mibs_parameters stMibsExtServiceFlowTable;
 	UINT		uiCurrentRxRate;
 	UINT		uiThisPeriodRxBytes;
@@ -244,8 +244,8 @@ struct bcm_mini_adapter {
 	/* this to keep track of the Tx and Rx MailBox Registers. */
 	atomic_t		CurrNumFreeTxDesc;
 	/* to keep track the no of byte received */
-	USHORT			PrevNumRecvDescs;
-	USHORT			CurrNumRecvDescs;
+	unsigned short		PrevNumRecvDescs;
+	unsigned short		CurrNumRecvDescs;
 	UINT			u32TotalDSD;
 	struct bcm_packet_info	PackInfo[NO_OF_QUEUES];
 	struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
@@ -284,7 +284,7 @@ struct bcm_mini_adapter {
 	bool			bBinDownloaded;
 	bool			bCfgDownloaded;
 	bool			bSyncUpRequestSent;
-	USHORT			usBestEffortQueueIndex;
+	unsigned short		usBestEffortQueueIndex;
 	wait_queue_head_t	ioctl_fw_dnld_wait_queue;
 	bool			waiting_to_fw_download_done;
 	pid_t			fw_download_process_pid;
@@ -400,7 +400,7 @@ struct bcm_mini_adapter {
 struct bcm_eth_header {
 	UCHAR	au8DestinationAddress[6];
 	UCHAR	au8SourceAddress[6];
-	USHORT	u16Etype;
+	unsigned short u16Etype;
 } __packed;
 
 struct bcm_firmware_info {
-- 
1.7.9.5

[PATCH 04/11 V2] Staging: bcm: Replaces UCHAR with u8 in Adapter.h

[Kevin McKinney]

This patch replace "UCHAR" with "u8"
in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |   82 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 08bd9fc..26850bf 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -10,13 +10,13 @@
 struct bcm_leader {
 	unsigned short Vcid;
 	unsigned short PLength;
-	UCHAR	Status;
-	UCHAR	Unused[3];
+	u8	Status;
+	u8	Unused[3];
 } __packed;
 
 struct bcm_packettosend {
 	struct bcm_leader Leader;
-	UCHAR	ucPayload;
+	u8	ucPayload;
 } __packed;
 
 struct bcm_control_packet {
@@ -27,7 +27,7 @@ struct bcm_control_packet {
 
 struct bcm_link_request {
 	struct bcm_leader Leader;
-	UCHAR	szData[4];
+	u8	szData[4];
 } __packed;
 
 #define MAX_IP_RANGE_LENGTH 4
@@ -45,46 +45,46 @@ union bcm_ip_address {
 		ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask Address Range */
 	};
 	struct {
-		UCHAR ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
-		UCHAR ucIpv4Mask[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+		u8 ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
+		u8 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];
+		u8 ucIpv6Address[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
+		u8 ucIpv6Mask[MAX_IP_RANGE_LENGTH * IPV6_ADDRESS_SIZEINBYTES];
 	};
 };
 
 struct bcm_hdr_suppression_contextinfo {
-	UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
-	UCHAR ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */
+	u8 ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
+	u8 ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */
 };
 
 struct bcm_classifier_rule {
 	ULONG		ulSFID;
-	UCHAR		ucReserved[2];
+	u8	ucReserved[2];
 	B_UINT16	uiClassifierRuleIndex;
 	bool		bUsed;
 	unsigned short	usVCID_Value;
 	B_UINT8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
 	union bcm_ip_address stSrcIpAddress;
-	UCHAR		ucIPSourceAddressLength; /* Ip Source Address Length */
+	u8	ucIPSourceAddressLength; /* Ip Source Address Length */
 
 	union bcm_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 */
+	u8	ucIPDestinationAddressLength; /* Ip Destination Address Length */
+	u8	ucIPTypeOfServiceLength; /* Type of service Length */
+	u8	ucTosLow; /* Tos Low */
+	u8	ucTosHigh; /* Tos High */
+	u8	ucTosMask; /* Tos Mask */
+
+	u8	ucProtocolLength; /* protocol Length */
+	u8	ucProtocol[MAX_PROTOCOL_LENGTH]; /* protocol Length */
 	unsigned short	usSrcPortRangeLo[MAX_PORT_RANGE];
 	unsigned short	usSrcPortRangeHi[MAX_PORT_RANGE];
-	UCHAR		ucSrcPortRangeLength;
+	u8	ucSrcPortRangeLength;
 
 	unsigned short	usDestPortRangeLo[MAX_PORT_RANGE];
 	unsigned short	usDestPortRangeHi[MAX_PORT_RANGE];
-	UCHAR		ucDestPortRangeLength;
+	u8	ucDestPortRangeLength;
 
 	bool		bProtocolValid;
 	bool		bTOSValid;
@@ -92,22 +92,22 @@ struct bcm_classifier_rule {
 	bool		bSrcIpValid;
 
 	/* For IPv6 Addressing */
-	UCHAR		ucDirection;
+	u8	ucDirection;
 	bool		bIpv6Protocol;
 	UINT32		u32PHSRuleID;
 	struct bcm_phs_rule sPhsRule;
-	UCHAR		u8AssociatedPHSI;
+	u8	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];
+	u8	ucEthCSSrcMACLen;
+	u8	au8EThCSSrcMAC[MAC_ADDRESS_SIZE];
+	u8	au8EThCSSrcMACMask[MAC_ADDRESS_SIZE];
+	u8	ucEthCSDestMACLen;
+	u8	au8EThCSDestMAC[MAC_ADDRESS_SIZE];
+	u8	au8EThCSDestMACMask[MAC_ADDRESS_SIZE];
+	u8	ucEtherTypeLen;
+	u8	au8EthCSEtherType[NUM_ETHERTYPE_BYTES];
+	u8	usUserPriority[2];
 	unsigned short	usVLANID;
 	unsigned short	usValidityBitMap;
 };
@@ -149,7 +149,7 @@ struct bcm_packet_info {
 	LARGE_INTEGER	liLastUpdateTokenAt;
 	UINT		uiMaxAllowedRate;
 	UINT		NumOfPacketsSent;
-	UCHAR		ucDirection;
+	u8	ucDirection;
 	unsigned short	usCID;
 	struct bcm_mibs_parameters stMibsExtServiceFlowTable;
 	UINT		uiCurrentRxRate;
@@ -157,7 +157,7 @@ struct bcm_packet_info {
 	UINT		uiTotalRxBytes;
 	UINT		uiTotalTxBytes;
 	UINT		uiPendedLast;
-	UCHAR		ucIpVersion;
+	u8	ucIpVersion;
 
 	union {
 		struct {
@@ -179,15 +179,15 @@ struct bcm_packet_info {
 	bool		bAdmittedSet;
 	bool		bAuthorizedSet;
 	bool		bClassifierPriority;
-	UCHAR		ucServiceClassName[MAX_CLASS_NAME_LENGTH];
+	u8	ucServiceClassName[MAX_CLASS_NAME_LENGTH];
 	bool		bHeaderSuppressionEnabled;
 	spinlock_t	SFQueueLock;
 	void		*pstSFIndication;
 	struct timeval	stLastUpdateTokenAt;
 	atomic_t	uiPerSFTxResourceCount;
 	UINT		uiMaxLatency;
-	UCHAR		bIPCSSupport;
-	UCHAR		bEthCSSupport;
+	u8	bIPCSSupport;
+	u8	bEthCSSupport;
 };
 
 struct bcm_tarang_data {
@@ -255,7 +255,7 @@ struct bcm_mini_adapter {
 	bool			bETHCSEnabled;
 	ULONG			BEBucketSize;
 	ULONG			rtPSBucketSize;
-	UCHAR			LinkStatus;
+	u8		LinkStatus;
 	bool			AutoLinkUp;
 	bool			AutoSyncup;
 
@@ -398,8 +398,8 @@ struct bcm_mini_adapter {
 #define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev)
 
 struct bcm_eth_header {
-	UCHAR	au8DestinationAddress[6];
-	UCHAR	au8SourceAddress[6];
+	u8 au8DestinationAddress[6];
+	u8 au8SourceAddress[6];
 	unsigned short u16Etype;
 } __packed;
 
-- 
1.7.9.5

[PATCH 05/11 V2] Staging: bcm: Replace ULONG with unsigned long or u32 in Adapter.h

[Kevin McKinney]

This patch replaces "ULONG" with "unsigned
long", or "u32" for ipv4 addresses, in
Adapter.h. For ipv4 addresses, all
formating is change to match u32 definition.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |   42 ++++++++++++++++++++---------------------
 drivers/staging/bcm/Bcmchar.c |    2 +-
 drivers/staging/bcm/CmHost.c  |    8 ++++----
 drivers/staging/bcm/Misc.c    |    8 ++++----
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 26850bf..a5dab86 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -37,12 +37,12 @@ struct bcm_link_request {
 
 union bcm_ip_address {
 	struct {
-		ULONG ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address Range */
-		ULONG ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */
+		u32 ulIpv4Addr[MAX_IP_RANGE_LENGTH]; /* Source Ip Address Range */
+		u32 ulIpv4Mask[MAX_IP_RANGE_LENGTH]; /* Source Ip Mask Address Range */
 	};
 	struct {
-		ULONG ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Address Range */
-		ULONG ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask Address Range */
+		unsigned long ulIpv6Addr[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Address Range */
+		unsigned long ulIpv6Mask[MAX_IP_RANGE_LENGTH * 4]; /* Source Ip Mask Address Range */
 	};
 	struct {
 		u8 ucIpv4Address[MAX_IP_RANGE_LENGTH * IP_LENGTH_OF_ADDRESS];
@@ -60,7 +60,7 @@ struct bcm_hdr_suppression_contextinfo {
 };
 
 struct bcm_classifier_rule {
-	ULONG		ulSFID;
+	unsigned long ulSFID;
 	u8	ucReserved[2];
 	B_UINT16	uiClassifierRuleIndex;
 	bool		bUsed;
@@ -114,7 +114,7 @@ struct bcm_classifier_rule {
 
 struct bcm_fragmented_packet_info {
 	bool			bUsed;
-	ULONG			ulSrcIpAddress;
+	unsigned long		ulSrcIpAddress;
 	unsigned short		usIpIdentification;
 	struct bcm_classifier_rule *pstMatchedClassifierEntry;
 	bool			bOutOfOrderFragment;
@@ -122,7 +122,7 @@ struct bcm_fragmented_packet_info {
 
 struct bcm_packet_info {
 	/* classification extension Rule */
-	ULONG		ulSFID;
+	unsigned long	ulSFID;
 	unsigned short	usVCID_Value;
 	UINT		uiThreshold;
 	/* This field determines the priority of the SF Queues */
@@ -199,11 +199,11 @@ struct bcm_tarang_data {
 	bool			MacTracingEnabled;
 	bool			bApplicationToExit;
 	struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
-	ULONG			RxCntrlMsgBitMask;
+	unsigned long		RxCntrlMsgBitMask;
 };
 
 struct bcm_targetdsx_buffer {
-	ULONG		ulTargetDsxBuffer;
+	unsigned long	ulTargetDsxBuffer;
 	B_UINT16	tid;
 	bool		valid;
 };
@@ -253,8 +253,8 @@ struct bcm_mini_adapter {
 
 	/*************** qos ******************/
 	bool			bETHCSEnabled;
-	ULONG			BEBucketSize;
-	ULONG			rtPSBucketSize;
+	unsigned long		BEBucketSize;
+	unsigned long		rtPSBucketSize;
 	u8		LinkStatus;
 	bool			AutoLinkUp;
 	bool			AutoSyncup;
@@ -275,9 +275,9 @@ struct bcm_mini_adapter {
 	struct semaphore	rdmwrmsync;
 
 	struct bcm_targetdsx_buffer	astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
-	ULONG			ulFreeTargetBufferCnt;
-	ULONG			ulCurrentTargetBuffer;
-	ULONG			ulTotalTargetBuffersAvailable;
+	unsigned long		ulFreeTargetBufferCnt;
+	unsigned long		ulCurrentTargetBuffer;
+	unsigned long		ulTotalTargetBuffersAvailable;
 	unsigned long		chip_id;
 	wait_queue_head_t	lowpower_mode_wait_queue;
 	bool			bFlashBoot;
@@ -294,7 +294,7 @@ struct bcm_mini_adapter {
 	bool			bIsAutoCorrectEnabled;
 	bool			bDDRInitDone;
 	int			DDRSetting;
-	ULONG			ulPowerSaveMode;
+	unsigned long		ulPowerSaveMode;
 	spinlock_t		txtransmitlock;
 	B_UINT8			txtransmit_running;
 	/* Thread for control packet handling */
@@ -356,9 +356,9 @@ struct bcm_mini_adapter {
 	 * Generally it is Active DSD but in case of NVM RD/WR it might be different.
 	 */
 	UINT			ulFlashCalStart;
-	ULONG			ulFlashControlSectionStart;
-	ULONG			ulFlashWriteSize;
-	ULONG			ulFlashID;
+	unsigned long		ulFlashControlSectionStart;
+	unsigned long		ulFlashWriteSize;
+	unsigned long		ulFlashID;
 	FP_FLASH_WRITE		fpFlashWrite;
 	FP_FLASH_WRITE_STATUS	fpFlashWriteWithStatusCheck;
 
@@ -390,7 +390,7 @@ struct bcm_mini_adapter {
 	bool			StopAllXaction;
 	UINT32			liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */
 	struct semaphore	LowPowerModeSync;
-	ULONG			liDrainCalculated;
+	unsigned long		liDrainCalculated;
 	UINT			gpioBitMap;
 	struct bcm_debug_state	stDebugState;
 };
@@ -405,8 +405,8 @@ struct bcm_eth_header {
 
 struct bcm_firmware_info {
 	void	__user *pvMappedFirmwareAddress;
-	ULONG	u32FirmwareLength;
-	ULONG	u32StartingAddress;
+	u32	u32FirmwareLength;
+	u32	u32StartingAddress;
 } __packed;
 
 /* holds the value of net_device structure.. */
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 9d57d04..147f669 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -828,7 +828,7 @@ cntrlEnd:
 		if (!psFwInfo->pvMappedFirmwareAddress ||
 			(psFwInfo->u32FirmwareLength == 0)) {
 
-			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
+			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %u\n",
 					psFwInfo->u32FirmwareLength);
 			up(&Adapter->fw_download_sema);
 			kfree(psFwInfo);
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 8ec1dd1..d12f413 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -162,11 +162,11 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
 			if (!bIpVersion6) {
 				if (eIpAddrContext == eSrcIpAddress) {
 					pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[i] = ntohl(pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[i]);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Src Ip Address:0x%luX ",
+					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Src Ip Address:0x%uX ",
 							pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[i]);
 				} else if (eIpAddrContext == eDestIpAddress) {
 					pstClassifierEntry->stDestIpAddress.ulIpv4Addr[i] = ntohl(pstClassifierEntry->stDestIpAddress.ulIpv4Addr[i]);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Dest Ip Address:0x%luX ",
+					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Dest Ip Address:0x%uX ",
 							pstClassifierEntry->stDestIpAddress.ulIpv4Addr[i]);
 				}
 			}
@@ -182,12 +182,12 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
 					if (eIpAddrContext == eSrcIpAddress) {
 						pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[i] =
 							ntohl(pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[i]);
-						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Src Ip Mask Address:0x%luX ",
+						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Src Ip Mask Address:0x%uX ",
 								pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[i]);
 					} else if (eIpAddrContext == eDestIpAddress) {
 						pstClassifierEntry->stDestIpAddress.ulIpv4Mask[i] =
 							ntohl(pstClassifierEntry->stDestIpAddress.ulIpv4Mask[i]);
-						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Dest Ip Mask Address:0x%luX ",
+						BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Dest Ip Mask Address:0x%uX ",
 								pstClassifierEntry->stDestIpAddress.ulIpv4Mask[i]);
 					}
 				}
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 7b2fa0f..276e268 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -697,8 +697,8 @@ void DumpPackInfo(struct bcm_mini_adapter *Adapter)
 					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tIpv6 ulSrcIpMask :\n");
 					DumpIpv6Address(pstClassifierEntry->stSrcIpAddress.ulIpv6Mask);
 				} else {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulSrcIpAddr:%lX\n", pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[uiIndex]);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulSrcIpMask:%lX\n", pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[uiIndex]);
+					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulSrcIpAddr:%uX\n", pstClassifierEntry->stSrcIpAddress.ulIpv4Addr[uiIndex]);
+					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulSrcIpMask:%uX\n", pstClassifierEntry->stSrcIpAddress.ulIpv4Mask[uiIndex]);
 				}
 			}
 
@@ -709,8 +709,8 @@ void DumpPackInfo(struct bcm_mini_adapter *Adapter)
 					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tIpv6 ulDestIpMask :\n");
 					DumpIpv6Address(pstClassifierEntry->stDestIpAddress.ulIpv6Mask);
 				} else {
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulDestIpAddr:%lX\n", pstClassifierEntry->stDestIpAddress.ulIpv4Addr[uiIndex]);
-					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulDestIpMask:%lX\n", pstClassifierEntry->stDestIpAddress.ulIpv4Mask[uiIndex]);
+					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulDestIpAddr:%uX\n", pstClassifierEntry->stDestIpAddress.ulIpv4Addr[uiIndex]);
+					BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tulDestIpMask:%uX\n", pstClassifierEntry->stDestIpAddress.ulIpv4Mask[uiIndex]);
 				}
 			}
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\tucProtocol:0x%X\n", pstClassifierEntry->ucProtocol[0]);
-- 
1.7.9.5

[PATCH 06/11 V2] Staging: bcm: Replace B_UINT16 with u16 in Adapter.h

[Kevin McKinney]

This patch replaces "B_UINT16" with "u16"
in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index a5dab86..01788d3 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -62,7 +62,7 @@ struct bcm_hdr_suppression_contextinfo {
 struct bcm_classifier_rule {
 	unsigned long ulSFID;
 	u8	ucReserved[2];
-	B_UINT16	uiClassifierRuleIndex;
+	u16	uiClassifierRuleIndex;
 	bool		bUsed;
 	unsigned short	usVCID_Value;
 	B_UINT8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
@@ -204,7 +204,7 @@ struct bcm_tarang_data {
 
 struct bcm_targetdsx_buffer {
 	unsigned long	ulTargetDsxBuffer;
-	B_UINT16	tid;
+	u16	tid;
 	bool		valid;
 };
 
-- 
1.7.9.5

[PATCH 07/11 V2] Staging: bcm: Replace B_UINT8 with u8 in Adapter.h

[Kevin McKinney]

This patch replaces "B_UINT8" with "u8"
in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 01788d3..f7620ab 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -65,7 +65,7 @@ struct bcm_classifier_rule {
 	u16	uiClassifierRuleIndex;
 	bool		bUsed;
 	unsigned short	usVCID_Value;
-	B_UINT8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
+	u8		u8ClassifierRulePriority; /* This field detemines the Classifier Priority */
 	union bcm_ip_address stSrcIpAddress;
 	u8	ucIPSourceAddressLength; /* Ip Source Address Length */
 
@@ -126,13 +126,13 @@ struct bcm_packet_info {
 	unsigned short	usVCID_Value;
 	UINT		uiThreshold;
 	/* This field determines the priority of the SF Queues */
-	B_UINT8		u8TrafficPriority;
+	u8		u8TrafficPriority;
 
 	bool		bValid;
 	bool		bActive;
 	bool		bActivateRequestSent;
 
-	B_UINT8		u8QueueType; /* BE or rtPS */
+	u8		u8QueueType; /* BE or rtPS */
 
 	UINT		uiMaxBucketSize; /* maximum size of the bucket for the queue */
 	UINT		uiCurrentQueueDepthOnTarget;
@@ -296,7 +296,7 @@ struct bcm_mini_adapter {
 	int			DDRSetting;
 	unsigned long		ulPowerSaveMode;
 	spinlock_t		txtransmitlock;
-	B_UINT8			txtransmit_running;
+	u8			txtransmit_running;
 	/* Thread for control packet handling */
 	struct task_struct	*control_packet_handler;
 	/* thread for transmitting packets. */
-- 
1.7.9.5

[PATCH 08/11 V2] Staging: bcm: Replace UINT32 with u32 in Adapter.h

[Kevin McKinney]

This patch replaces "UINT32" with "u32"
in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index f7620ab..35f480a 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -94,7 +94,7 @@ struct bcm_classifier_rule {
 	/* For IPv6 Addressing */
 	u8	ucDirection;
 	bool		bIpv6Protocol;
-	UINT32		u32PHSRuleID;
+	u32		u32PHSRuleID;
 	struct bcm_phs_rule sPhsRule;
 	u8	u8AssociatedPHSI;
 
@@ -340,11 +340,11 @@ struct bcm_mini_adapter {
 	bool			AutoFirmDld;
 	bool			bMipsConfig;
 	bool			bDPLLConfig;
-	UINT32			aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
-	UINT32			aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+	u32			aTxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
+	u32			aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
 	struct bcm_fragmented_packet_info astFragmentedPktClassifierTable[MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES];
 	atomic_t		uiMBupdate;
-	UINT32			PmuMode;
+	u32			PmuMode;
 	enum bcm_nvm_type	eNVMType;
 	UINT			uiSectorSize;
 	UINT			uiSectorSizeInCFG;
@@ -388,7 +388,7 @@ struct bcm_mini_adapter {
 	bool			bDoSuspend;
 	UINT			syscfgBefFwDld;
 	bool			StopAllXaction;
-	UINT32			liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */
+	u32			liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */
 	struct semaphore	LowPowerModeSync;
 	unsigned long		liDrainCalculated;
 	UINT			gpioBitMap;
-- 
1.7.9.5

[PATCH 09/11 V2] Staging: bcm: Replace UINT with unsigned int in Adapter.h

[Kevin McKinney]

This patch replaces "UINT" with "unsigned
int" in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |   84 ++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 35f480a..32343e3 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -21,7 +21,7 @@ struct bcm_packettosend {
 
 struct bcm_control_packet {
 	PVOID	ControlBuff;
-	UINT	ControlBuffLen;
+	unsigned int ControlBuffLen;
 	struct bcm_control_packet *next;
 } __packed;
 
@@ -124,7 +124,7 @@ struct bcm_packet_info {
 	/* classification extension Rule */
 	unsigned long	ulSFID;
 	unsigned short	usVCID_Value;
-	UINT		uiThreshold;
+	unsigned int	uiThreshold;
 	/* This field determines the priority of the SF Queues */
 	u8		u8TrafficPriority;
 
@@ -134,29 +134,29 @@ struct bcm_packet_info {
 
 	u8		u8QueueType; /* BE or rtPS */
 
-	UINT		uiMaxBucketSize; /* maximum size of the bucket for the queue */
-	UINT		uiCurrentQueueDepthOnTarget;
-	UINT		uiCurrentBytesOnHost;
-	UINT		uiCurrentPacketsOnHost;
-	UINT		uiDroppedCountBytes;
-	UINT		uiDroppedCountPackets;
-	UINT		uiSentBytes;
-	UINT		uiSentPackets;
-	UINT		uiCurrentDrainRate;
-	UINT		uiThisPeriodSentBytes;
+	unsigned int	uiMaxBucketSize; /* maximum size of the bucket for the queue */
+	unsigned int	uiCurrentQueueDepthOnTarget;
+	unsigned int	uiCurrentBytesOnHost;
+	unsigned int	uiCurrentPacketsOnHost;
+	unsigned int	uiDroppedCountBytes;
+	unsigned int	uiDroppedCountPackets;
+	unsigned int	uiSentBytes;
+	unsigned int	uiSentPackets;
+	unsigned int	uiCurrentDrainRate;
+	unsigned int	uiThisPeriodSentBytes;
 	LARGE_INTEGER	liDrainCalculated;
-	UINT		uiCurrentTokenCount;
+	unsigned int	uiCurrentTokenCount;
 	LARGE_INTEGER	liLastUpdateTokenAt;
-	UINT		uiMaxAllowedRate;
-	UINT		NumOfPacketsSent;
+	unsigned int	uiMaxAllowedRate;
+	unsigned int	NumOfPacketsSent;
 	u8	ucDirection;
 	unsigned short	usCID;
 	struct bcm_mibs_parameters stMibsExtServiceFlowTable;
-	UINT		uiCurrentRxRate;
-	UINT		uiThisPeriodRxBytes;
-	UINT		uiTotalRxBytes;
-	UINT		uiTotalTxBytes;
-	UINT		uiPendedLast;
+	unsigned int	uiCurrentRxRate;
+	unsigned int	uiThisPeriodRxBytes;
+	unsigned int	uiTotalRxBytes;
+	unsigned int	uiTotalTxBytes;
+	unsigned int	uiPendedLast;
 	u8	ucIpVersion;
 
 	union {
@@ -185,7 +185,7 @@ struct bcm_packet_info {
 	void		*pstSFIndication;
 	struct timeval	stLastUpdateTokenAt;
 	atomic_t	uiPerSFTxResourceCount;
-	UINT		uiMaxLatency;
+	unsigned int	uiMaxLatency;
 	u8	bIPCSSupport;
 	u8	bEthCSSupport;
 };
@@ -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 *, unsigned int, PVOID);
 
-typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, PVOID);
 
 /*
  * Driver adapter data structure
@@ -246,7 +246,7 @@ struct bcm_mini_adapter {
 	/* to keep track the no of byte received */
 	unsigned short		PrevNumRecvDescs;
 	unsigned short		CurrNumRecvDescs;
-	UINT			u32TotalDSD;
+	unsigned int		u32TotalDSD;
 	struct bcm_packet_info	PackInfo[NO_OF_QUEUES];
 	struct bcm_classifier_rule astClassifierTable[MAX_CLASSIFIERS];
 	bool			TransferMode;
@@ -271,7 +271,7 @@ struct bcm_mini_adapter {
 	atomic_t		index_app_read_cntrlpkt;
 	atomic_t		index_wr_txcntrlpkt;
 	atomic_t		index_rd_txcntrlpkt;
-	UINT			index_datpkt;
+	unsigned int		index_datpkt;
 	struct semaphore	rdmwrmsync;
 
 	struct bcm_targetdsx_buffer	astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
@@ -316,14 +316,14 @@ struct bcm_mini_adapter {
 					struct file *,
 					unsigned int);
 	int (*interface_rdm)(PVOID,
-			UINT,
+			unsigned int,
 			PVOID,
 			int);
 	int (*interface_wrm)(PVOID,
-			UINT,
+			unsigned int,
 			PVOID,
 			int);
-	int (*interface_transmit)(PVOID, PVOID , UINT);
+	int (*interface_transmit)(PVOID, PVOID , unsigned int);
 	bool			IdleMode;
 	bool			bDregRequestSentInIdleMode;
 	bool			bTriedToWakeUpFromlowPowerMode;
@@ -346,16 +346,16 @@ struct bcm_mini_adapter {
 	atomic_t		uiMBupdate;
 	u32			PmuMode;
 	enum bcm_nvm_type	eNVMType;
-	UINT			uiSectorSize;
-	UINT			uiSectorSizeInCFG;
+	unsigned int		uiSectorSize;
+	unsigned int		uiSectorSizeInCFG;
 	bool			bSectorSizeOverride;
 	bool			bStatusWrite;
-	UINT			uiNVMDSDSize;
-	UINT			uiVendorExtnFlag;
+	unsigned int		uiNVMDSDSize;
+	unsigned int		uiVendorExtnFlag;
 	/* it will always represent chosen DSD at any point of time.
 	 * Generally it is Active DSD but in case of NVM RD/WR it might be different.
 	 */
-	UINT			ulFlashCalStart;
+	unsigned int		ulFlashCalStart;
 	unsigned long		ulFlashControlSectionStart;
 	unsigned long		ulFlashWriteSize;
 	unsigned long		ulFlashID;
@@ -369,13 +369,13 @@ struct bcm_mini_adapter {
 	struct bcm_flash2x_cs_info *psFlash2xCSInfo;
 	struct bcm_flash_cs_info *psFlashCSInfo;
 	struct bcm_flash2x_vendor_info *psFlash2xVendorInfo;
-	UINT			uiFlashBaseAdd; /* Flash start address */
-	UINT			uiActiveISOOffset; /* Active ISO offset chosen before f/w download */
+	unsigned int		uiFlashBaseAdd; /* Flash start address */
+	unsigned int		uiActiveISOOffset; /* Active ISO offset chosen before f/w download */
 	enum bcm_flash2x_section_val eActiveISO; /* Active ISO section val */
 	enum bcm_flash2x_section_val eActiveDSD; /* Active DSD val chosen before f/w download */
-	UINT			uiActiveDSDOffsetAtFwDld;  /* For accessing Active DSD chosen before f/w download */
-	UINT			uiFlashLayoutMajorVersion;
-	UINT			uiFlashLayoutMinorVersion;
+	unsigned int		uiActiveDSDOffsetAtFwDld;  /* For accessing Active DSD chosen before f/w download */
+	unsigned int		uiFlashLayoutMajorVersion;
+	unsigned int		uiFlashLayoutMinorVersion;
 	bool			bAllDSDWriteAllow;
 	bool			bSigCorrupted;
 	/* this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately. */
@@ -386,12 +386,12 @@ struct bcm_mini_adapter {
 	bool			bFlashRawRead;
 	bool			bPreparingForLowPowerMode;
 	bool			bDoSuspend;
-	UINT			syscfgBefFwDld;
+	unsigned int		syscfgBefFwDld;
 	bool			StopAllXaction;
 	u32			liTimeSinceLastNetEntry; /* Used to Support extended CAPI requirements from */
 	struct semaphore	LowPowerModeSync;
 	unsigned long		liDrainCalculated;
-	UINT			gpioBitMap;
+	unsigned int		gpioBitMap;
 	struct bcm_debug_state	stDebugState;
 };
 
@@ -413,8 +413,8 @@ struct bcm_firmware_info {
 extern struct net_device *gblpnetdev;
 
 struct bcm_ddr_setting {
-	UINT ulRegAddress;
-	UINT ulRegValue;
+	unsigned int ulRegAddress;
+	unsigned int ulRegValue;
 };
 int InitAdapter(struct bcm_mini_adapter *psAdapter);
 
-- 
1.7.9.5

[PATCH 10/11 V2] Staging: bcm: Replace PVOID with void * in Adapter.h

[Kevin McKinney]

This patch replaces "PVOID" with "void *"
in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 32343e3..7055b83 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;
 	unsigned int 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 *, unsigned int, PVOID);
+typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, unsigned int, void *);
 
-typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, PVOID);
+typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, unsigned int, 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 *,
 			unsigned int,
-			PVOID,
+			void *,
 			int);
-	int (*interface_wrm)(PVOID,
+	int (*interface_wrm)(void *,
 			unsigned int,
-			PVOID,
+			void *,
 			int);
-	int (*interface_transmit)(PVOID, PVOID , unsigned int);
+	int (*interface_transmit)(void *, void *, unsigned int);
 	bool			IdleMode;
 	bool			bDregRequestSentInIdleMode;
 	bool			bTriedToWakeUpFromlowPowerMode;
-- 
1.7.9.5

[PATCH 11/11 V2] Staging: bcm: Replace LARGE_INTEGER with u64 in Adapter.h

[Kevin McKinney]

This patch replaces "LARGE_INTEGER" with "u64"
in Adapter.h

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
---
 drivers/staging/bcm/Adapter.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 7055b83..c373bc0 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -144,9 +144,9 @@ struct bcm_packet_info {
 	unsigned int	uiSentPackets;
 	unsigned int	uiCurrentDrainRate;
 	unsigned int	uiThisPeriodSentBytes;
-	LARGE_INTEGER	liDrainCalculated;
+	u64		liDrainCalculated;
 	unsigned int	uiCurrentTokenCount;
-	LARGE_INTEGER	liLastUpdateTokenAt;
+	u64		liLastUpdateTokenAt;
 	unsigned int	uiMaxAllowedRate;
 	unsigned int	NumOfPacketsSent;
 	u8	ucDirection;
-- 
1.7.9.5

Re: [PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

[Greg KH]

On Mon, Oct 28, 2013 at 11:51:39PM -0400, Kevin McKinney wrote:
> This patch removes typedef for _U_IP_ADDRESS, and
> changes the name of the struct to bcm_ip_address. In
> addition, any calls to struct "U_IP_ADDRESS" are
> changed to call directly.
> 
> Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>

Someone already sent me a patch that did much the same thing so your
patch no longer applied :(

greg k-h

Re: [PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

[Greg KH]

On Tue, Oct 29, 2013 at 09:01:48AM -0700, Greg KH wrote:
> On Mon, Oct 28, 2013 at 11:51:39PM -0400, Kevin McKinney wrote:
> > This patch removes typedef for _U_IP_ADDRESS, and
> > changes the name of the struct to bcm_ip_address. In
> > addition, any calls to struct "U_IP_ADDRESS" are
> > changed to call directly.
> > 
> > Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
> 
> Someone already sent me a patch that did much the same thing so your
> patch no longer applied :(

This causes the rest of the patches to also not apply, can you please
resin them against my latest tree?

thanks,

greg k-h

Re: [PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

[Greg KH]

On Tue, Oct 29, 2013 at 01:01:39PM -0400, Kevin McKinney wrote:
> Sure, I will resend these patches.  I tried to be careful, and apply all other
> patches before I re-did mine. I must have missed something. I will resend. In
> the past I developed my patches against the linux-next branch.  Is this still
> the right branch to use?

Yes it is.

thanks,

greg k-h

Re: [PATCH 02/11 V2] Staging: bcm: Remove typedef for _U_IP_ADDRESS and call directly.

[Greg KH]

On Tue, Oct 29, 2013 at 01:10:07PM -0400, Kevin McKinney wrote:
> On Tue, Oct 29, 2013 at 1:04 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> 
>     On Tue, Oct 29, 2013 at 01:01:39PM -0400, Kevin McKinney wrote:
>     > Sure, I will resend these patches.  I tried to be careful, and apply all
>     other
>     > patches before I re-did mine. I must have missed something. I will
>     resend. In
>     > the past I developed my patches against the linux-next branch.  Is this
>     still
>     > the right branch to use?
> 
>     Yes it is.
> 
> 
> Did someone already submit these patches? If so, I won't bother resending :)

No they did not, yours just conflicts with patches others have done.

Also, don't send html email, the mailing lists reject it.

thanks,

greg k-h