[PATCH 02/34] staging: bcm: Convert spaces to tabs

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


Also removed some trailing empty c99 comments.
git diff -w shows just lines with comments deleted.

Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/bcm/Adapter.h                  |  184 ++++++++++++------------
 drivers/staging/bcm/Bcmnet.c                   |    6 +-
 drivers/staging/bcm/CmHost.c                   |   26 ++--
 drivers/staging/bcm/CmHost.h                   |   16 +-
 drivers/staging/bcm/DDRInit.c                  |    2 +-
 drivers/staging/bcm/Debug.h                    |  102 +++++++-------
 drivers/staging/bcm/HostMIBSInterface.h        |   44 +++---
 drivers/staging/bcm/InterfaceAdapter.h         |    8 +-
 drivers/staging/bcm/InterfaceIdleMode.c        |    4 +-
 drivers/staging/bcm/InterfaceInit.h            |   12 +-
 drivers/staging/bcm/InterfaceMacros.h          |    2 +-
 drivers/staging/bcm/InterfaceRx.c              |    8 +-
 drivers/staging/bcm/Ioctl.h                    |  122 ++++++++--------
 drivers/staging/bcm/LeakyBucket.c              |   24 ++--
 drivers/staging/bcm/PHSDefines.h               |    8 +-
 drivers/staging/bcm/PHSModule.c                |   10 +-
 drivers/staging/bcm/Protocol.h                 |   12 +-
 drivers/staging/bcm/Qos.c                      |   70 +++++-----
 drivers/staging/bcm/Queue.h                    |   10 +-
 drivers/staging/bcm/Transmit.c                 |    2 +-
 drivers/staging/bcm/Version.h                  |    2 +-
 drivers/staging/bcm/cntrl_SignalingInterface.h |   26 ++--
 drivers/staging/bcm/headers.h                  |    2 +-
 drivers/staging/bcm/led_control.h              |   28 ++--
 drivers/staging/bcm/nvm.c                      |  138 +++++++++---------
 drivers/staging/bcm/nvm.h                      |   28 ++--
 drivers/staging/bcm/vendorspecificextn.c       |    4 +-
 27 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index d3c3f89..226efbd 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -6,9 +6,9 @@
 
 struct _LEADER
 {
-	USHORT 	Vcid;
-	USHORT 	PLength;
-	UCHAR  	Status;
+	USHORT	Vcid;
+	USHORT	PLength;
+	UCHAR	Status;
 	UCHAR	Unused[3];
 }__attribute__((packed));
 typedef struct _LEADER LEADER,*PLEADER;
@@ -41,22 +41,22 @@ typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;
 //classification extension is added
 typedef struct _ADD_CONNECTION
 {
-	ULONG 		SrcIpAddressCount;
-	ULONG 		SrcIpAddress[MAX_CONNECTIONS];
-	ULONG 		SrcIpMask[MAX_CONNECTIONS];
+	ULONG		SrcIpAddressCount;
+	ULONG		SrcIpAddress[MAX_CONNECTIONS];
+	ULONG		SrcIpMask[MAX_CONNECTIONS];
 
-	ULONG 		DestIpAddressCount;
-	ULONG 		DestIpAddress[MAX_CONNECTIONS];
-	ULONG 		DestIpMask[MAX_CONNECTIONS];
+	ULONG		DestIpAddressCount;
+	ULONG		DestIpAddress[MAX_CONNECTIONS];
+	ULONG		DestIpMask[MAX_CONNECTIONS];
 
-	USHORT 		SrcPortBegin;
-	USHORT 		SrcPortEnd;
+	USHORT		SrcPortBegin;
+	USHORT		SrcPortEnd;
 
-	USHORT 		DestPortBegin;
-	USHORT 		DestPortEnd;
+	USHORT		DestPortBegin;
+	USHORT		DestPortEnd;
 
-	UCHAR 		SrcTOS;
-	UCHAR 		SrcProtocol;
+	UCHAR		SrcTOS;
+	UCHAR		SrcProtocol;
 } ADD_CONNECTION,*PADD_CONNECTION;
 
 
@@ -75,11 +75,11 @@ typedef struct _CLASSIFICATION_RULE
 
 typedef struct _CLASSIFICATION_ONLY
 {
-	USHORT 		usVcid;
-	ULONG  		DestIpAddress;
-	ULONG  		DestIpMask;
-	USHORT 		usPortLo;
-	USHORT 		usPortHi;
+	USHORT		usVcid;
+	ULONG		DestIpAddress;
+	ULONG		DestIpMask;
+	USHORT		usPortLo;
+	USHORT		usPortHi;
 	BOOLEAN		bIpVersion;
 	UCHAR		ucDestinationAddress[16];
 } CLASSIFICATION_ONLY, *PCLASSIFICATION_ONLY;
@@ -149,21 +149,21 @@ typedef struct _S_CLASSIFIER_RULE
 	USHORT			usSrcPortRangeHi[MAX_PORT_RANGE];
 	UCHAR           ucSrcPortRangeLength;
 
-	USHORT			usDestPortRangeLo[MAX_PORT_RANGE];
-	USHORT			usDestPortRangeHi[MAX_PORT_RANGE];
+	USHORT		usDestPortRangeLo[MAX_PORT_RANGE];
+	USHORT		usDestPortRangeHi[MAX_PORT_RANGE];
 	UCHAR           ucDestPortRangeLength;
 
-	BOOLEAN			bProtocolValid;
-	BOOLEAN			bTOSValid;
-	BOOLEAN			bDestIpValid;
-	BOOLEAN			bSrcIpValid;
+	BOOLEAN		bProtocolValid;
+	BOOLEAN		bTOSValid;
+	BOOLEAN		bDestIpValid;
+	BOOLEAN		bSrcIpValid;
 
 	//For IPv6 Addressing
-	UCHAR			ucDirection;
+	UCHAR		ucDirection;
 	BOOLEAN         bIpv6Protocol;
 	UINT32          u32PHSRuleID;
-	S_PHS_RULE 	    sPhsRule;
-	UCHAR			u8AssociatedPHSI;
+	S_PHS_RULE	sPhsRule;
+	UCHAR		u8AssociatedPHSI;
 
 	//Classification fields for ETH CS
 	UCHAR		ucEthCSSrcMACLen;
@@ -182,52 +182,52 @@ typedef struct _S_CLASSIFIER_RULE
 
 typedef struct _S_FRAGMENTED_PACKET_INFO
 {
-	BOOLEAN				bUsed;
-	ULONG		        ulSrcIpAddress;
-	USHORT 				usIpIdentification;
-	S_CLASSIFIER_RULE 	*pstMatchedClassifierEntry;
-	BOOLEAN				bOutOfOrderFragment;
+	BOOLEAN			bUsed;
+	ULONG			ulSrcIpAddress;
+	USHORT			usIpIdentification;
+	S_CLASSIFIER_RULE	*pstMatchedClassifierEntry;
+	BOOLEAN			bOutOfOrderFragment;
 }S_FRAGMENTED_PACKET_INFO,*PS_FRAGMENTED_PACKET_INFO;
 
 struct _packet_info
 {
 	//classification extension Rule
-   	ULONG			ulSFID;
-   	USHORT			usVCID_Value;
+	ULONG			ulSFID;
+	USHORT			usVCID_Value;
 	UINT			uiThreshold;
 	// This field determines the priority of the SF Queues
-	B_UINT8     	u8TrafficPriority;
-
-	BOOLEAN			bValid;
-   	BOOLEAN     	bActive;
-	BOOLEAN			bActivateRequestSent;
-
-	B_UINT8			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;
+	B_UINT8	u8TrafficPriority;
+
+	BOOLEAN		bValid;
+	BOOLEAN		bActive;
+	BOOLEAN		bActivateRequestSent;
+
+	B_UINT8		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;
 	LARGE_INTEGER	liDrainCalculated;
-	UINT			uiCurrentTokenCount;
-	LARGE_INTEGER 	liLastUpdateTokenAt;
-	UINT			uiMaxAllowedRate;
-	UINT			NumOfPacketsSent;
-	UCHAR			ucDirection;
-	USHORT			usCID;
+	UINT		uiCurrentTokenCount;
+	LARGE_INTEGER	liLastUpdateTokenAt;
+	UINT		uiMaxAllowedRate;
+	UINT		NumOfPacketsSent;
+	UCHAR		ucDirection;
+	USHORT		usCID;
 	S_MIBS_EXTSERVICEFLOW_PARAMETERS	stMibsExtServiceFlowTable;
-	UINT			uiCurrentRxRate;
-	UINT			uiThisPeriodRxBytes;
-	UINT			uiTotalRxBytes;
-	UINT			uiTotalTxBytes;
-	UINT			uiPendedLast;
-	UCHAR			ucIpVersion;
+	UINT		uiCurrentRxRate;
+	UINT		uiThisPeriodRxBytes;
+	UINT		uiTotalRxBytes;
+	UINT		uiTotalTxBytes;
+	UINT		uiPendedLast;
+	UCHAR		ucIpVersion;
 
 	union
 	{
@@ -254,12 +254,12 @@ struct _packet_info
 	UCHAR		ucServiceClassName[MAX_CLASS_NAME_LENGTH];
 	BOOLEAN     bHeaderSuppressionEnabled;
 	spinlock_t	SFQueueLock;
-	void 		*pstSFIndication;
+	void		*pstSFIndication;
 	struct timeval	stLastUpdateTokenAt;
-	atomic_t 	uiPerSFTxResourceCount;
+	atomic_t	uiPerSFTxResourceCount;
 	UINT		uiMaxLatency;
-	UCHAR 	bIPCSSupport;
-	UCHAR 	bEthCSSupport;
+	UCHAR	bIPCSSupport;
+	UCHAR	bEthCSSupport;
 };
 typedef struct _packet_info PacketInfo;
 
@@ -274,7 +274,7 @@ typedef struct _PER_TARANG_DATA
 	BOOLEAN             MacTracingEnabled;
 	BOOLEAN				bApplicationToExit;
 	S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs;
-	ULONG 				RxCntrlMsgBitMask;
+	ULONG				RxCntrlMsgBitMask;
 } PER_TARANG_DATA, *PPER_TARANG_DATA;
 
 
@@ -385,12 +385,12 @@ struct _MINI_ADAPTER
 	CHAR                *caDsxReqResp;
 	atomic_t		ApplicationRunning;
 	volatile INT		CtrlQueueLen;
-	atomic_t            	AppCtrlQueueLen;
-	BOOLEAN             	AppCtrlQueueOverFlow;
+	atomic_t	AppCtrlQueueLen;
+	BOOLEAN	AppCtrlQueueOverFlow;
 	atomic_t		CurrentApplicationCount;
-	atomic_t 		RegisteredApplicationCount;
-	BOOLEAN		  	LinkUpStatus;
-	BOOLEAN		    	TimerActive;
+	atomic_t		RegisteredApplicationCount;
+	BOOLEAN			LinkUpStatus;
+	BOOLEAN			TimerActive;
 	u32			StatisticsPointer;
 	struct sk_buff		*RxControlHead;
 	struct sk_buff		*RxControlTail;
@@ -428,27 +428,27 @@ struct _MINI_ADAPTER
 
 	int				major;
 	int				minor;
-	wait_queue_head_t 	tx_packet_wait_queue;
-	wait_queue_head_t 	process_rx_cntrlpkt;
+	wait_queue_head_t	tx_packet_wait_queue;
+	wait_queue_head_t	process_rx_cntrlpkt;
 	atomic_t			process_waiting;
-	BOOLEAN 			fw_download_done;
+	BOOLEAN			fw_download_done;
 
-	char 				*txctlpacket[MAX_CNTRL_PKTS];
+	char				*txctlpacket[MAX_CNTRL_PKTS];
 	atomic_t			cntrlpktCnt ;
 	atomic_t			index_app_read_cntrlpkt;
 	atomic_t			index_wr_txcntrlpkt;
 	atomic_t			index_rd_txcntrlpkt;
 	UINT				index_datpkt;
-	struct semaphore 	rdmwrmsync;
+	struct semaphore	rdmwrmsync;
 
 	STTARGETDSXBUFFER	astTargetDsxBuffer[MAX_TARGET_DSX_BUFFERS];
 	ULONG			ulFreeTargetBufferCnt;
-	ULONG              	ulCurrentTargetBuffer;
-	ULONG              	ulTotalTargetBuffersAvailable;
+	ULONG	ulCurrentTargetBuffer;
+	ULONG	ulTotalTargetBuffersAvailable;
 
-	unsigned long 		chip_id;
+	unsigned long		chip_id;
 
-	wait_queue_head_t 	lowpower_mode_wait_queue;
+	wait_queue_head_t	lowpower_mode_wait_queue;
 
 	BOOLEAN			bFlashBoot;
 	BOOLEAN			bBinDownloaded;
@@ -456,7 +456,7 @@ struct _MINI_ADAPTER
 	BOOLEAN			bSyncUpRequestSent;
 	USHORT			usBestEffortQueueIndex;
 
-	wait_queue_head_t 	ioctl_fw_dnld_wait_queue;
+	wait_queue_head_t	ioctl_fw_dnld_wait_queue;
 	BOOLEAN				waiting_to_fw_download_done;
 	pid_t				fw_download_process_pid;
 	PSTARGETPARAMS		pstargetparams;
@@ -469,9 +469,9 @@ struct _MINI_ADAPTER
 	spinlock_t			txtransmitlock;
 	B_UINT8				txtransmit_running;
 	/* Thread for control packet handling */
-	struct task_struct 	*control_packet_handler;
+	struct task_struct	*control_packet_handler;
 	/* thread for transmitting packets. */
-	struct task_struct 	*transmit_packet_thread;
+	struct task_struct	*transmit_packet_thread;
 
 	/* LED Related Structures */
 	LED_INFO_STRUCT		LEDInfo;
@@ -504,7 +504,7 @@ struct _MINI_ADAPTER
 	//BOOLEAN			bTriedToWakeUpFromShutdown;
 	BOOLEAN			bLinkDownRequested;
 
-	int 			downloadDDR;
+	int			downloadDDR;
 	PHS_DEVICE_EXTENSION stBCMPhsContext;
 	S_HDR_SUPRESSION_CONTEXTINFO	stPhsTxContextInfo;
 	uint8_t			ucaPHSPktRestoreBuf[2048];
@@ -591,8 +591,8 @@ typedef struct FirmwareInfo
 // holds the value of net_device structure..
 extern struct net_device *gblpnetdev;
 typedef struct _cntl_pkt{
-	PMINI_ADAPTER 	Adapter;
-	PLEADER 		PLeader;
+	PMINI_ADAPTER	Adapter;
+	PLEADER		PLeader;
 }cntl_pkt;
 typedef LINK_REQUEST CONTROL_MESSAGE;
 
@@ -612,7 +612,7 @@ InitAdapter(PMINI_ADAPTER psAdapter);
 #define BCM_REQUEST_READ  0x2
 #define BCM_REQUEST_WRITE 0x1
 #define EP2_MPS_REG  0x0F0110A0
-#define EP2_MPS 	 0x40
+#define EP2_MPS	 0x40
 
 #define EP2_CFG_REG  0x0F0110A8
 #define EP2_CFG_INT  0x27
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 1b02b29..eaf823e 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -112,9 +112,9 @@ drop:
 static const struct net_device_ops bcmNetDevOps = {
 	.ndo_open		= bcm_open,
 	.ndo_stop		= bcm_close,
-	.ndo_start_xmit	        = bcm_transmit,
-	.ndo_change_mtu	        = eth_change_mtu,
-	.ndo_set_mac_address    = eth_mac_addr,
+	.ndo_start_xmit		= bcm_transmit,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address	= eth_mac_addr,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_select_queue	= bcm_select_queue,
 };
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 0869549..2053c3b 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -25,14 +25,14 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid);
  *				specified SFID as input parameter.
  *
  * Parameters  -	Adapter: Pointer to the Adapter structure
- *			   	uiSfid : Given SFID for matching
+ *				uiSfid : Given SFID for matching
  *
  * Returns	  - Queue index for this SFID(If matched)
 				Else Invalid Queue Index(If Not matched)
 ************************************************************/
 INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
 {
-	INT 	iIndex=0;
+	INT	iIndex=0;
 	for(iIndex=(NO_OF_QUEUES-1); iIndex>=0; iIndex--)
 		if(Adapter->PackInfo[iIndex].ulSFID==uiSfid)
 			return iIndex;
@@ -51,7 +51,7 @@ INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid)
  ****************************************************************/
 static INT SearchFreeSfid(PMINI_ADAPTER Adapter)
 {
-	UINT 	uiIndex=0;
+	UINT	uiIndex=0;
 
 	for(uiIndex=0; uiIndex < (NO_OF_QUEUES-1); uiIndex++)
 		if(Adapter->PackInfo[uiIndex].ulSFID==0)
@@ -253,14 +253,14 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry ,
 					pstClassifierEntry->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]=
 						ntohl(pstClassifierEntry->stSrcIpAddress.
 						      ulIpv6Addr[ucLoopIndex]);
-					pstClassifierEntry->stSrcIpAddress.ulIpv6Mask[ucLoopIndex]= 							ntohl(pstClassifierEntry->stSrcIpAddress.
+					pstClassifierEntry->stSrcIpAddress.ulIpv6Mask[ucLoopIndex]=							ntohl(pstClassifierEntry->stSrcIpAddress.
 																			      ulIpv6Mask[ucLoopIndex]);
 				}
 				else if(eIpAddrContext == eDestIpAddress)
 				{
-					pstClassifierEntry->stDestIpAddress.ulIpv6Addr[ucLoopIndex]= 							ntohl(pstClassifierEntry->stDestIpAddress.
+					pstClassifierEntry->stDestIpAddress.ulIpv6Addr[ucLoopIndex]=							ntohl(pstClassifierEntry->stDestIpAddress.
 																			      ulIpv6Addr[ucLoopIndex]);
-					pstClassifierEntry->stDestIpAddress.ulIpv6Mask[ucLoopIndex]= 							ntohl(pstClassifierEntry->stDestIpAddress.
+					pstClassifierEntry->stDestIpAddress.ulIpv6Mask[ucLoopIndex]=							ntohl(pstClassifierEntry->stDestIpAddress.
 																			      ulIpv6Mask[ucLoopIndex]);
 				}
 			}
@@ -1044,7 +1044,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter,		/**<Pointer to the A
  *************************************************************************/
 static VOID DumpCmControlPacket(PVOID pvBuffer)
 {
-	UINT 					uiLoopIndex;
+	UINT					uiLoopIndex;
 	UINT                    nIndex;
 	stLocalSFAddIndicationAlt  *pstAddIndication;
 	UINT                    nCurClassifierCnt;
@@ -1564,7 +1564,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[5]);
 
 		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
-			"u8EthertypeLength  	: 0x%02X\n",
+			"u8EthertypeLength	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8EthertypeLength);
 		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
 			"u8Ethertype[3]		: 0x%02X %02X %02X\n",
@@ -1573,7 +1573,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			psfCSType->cCPacketClassificationRule.u8Ethertype[2]);
 
 		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
-			"u16UserPriority 	: 0x%X\n",
+			"u16UserPriority	: 0x%X\n",
 			psfCSType->cCPacketClassificationRule.u16UserPriority);
 		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
 			"u16VLANID			: 0x%X\n",
@@ -1589,7 +1589,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 			"u8VendorSpecificClassifierParamLength	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParamLength);
 		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
-			"u8VendorSpecificClassifierParam[1] 	: 0x%02X\n",
+			"u8VendorSpecificClassifierParam[1]	: 0x%02X\n",
 			psfCSType->cCPacketClassificationRule.u8VendorSpecificClassifierParam[0]);
 #ifdef VERSION_D5
 		bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL,
@@ -2152,7 +2152,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
 		"Reading DSX buffer From Target location %x\n",
 		DSX_MESSAGE_EXCHANGE_BUFFER);
 
- 	Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER,
+	Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER,
 			(PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
 	if(Status < 0)
 	{
@@ -2267,8 +2267,8 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 	)
 {
 	stServiceFlowParamSI			*psfLocalSet=NULL;
-	stLocalSFAddIndicationAlt 	 	*pstAddIndication = NULL;
-	stLocalSFChangeIndicationAlt 	*pstChangeIndication = NULL;
+	stLocalSFAddIndicationAlt		*pstAddIndication = NULL;
+	stLocalSFChangeIndicationAlt	*pstChangeIndication = NULL;
 	PLEADER							pLeader=NULL;
 	/*
 	//Otherwise the message contains a target address from where we need to
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 8ce0838..96f2987 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -57,8 +57,8 @@ typedef struct stLocalSFAddIndicationAlt{
 	/// \brief structure ActiveSet
 	stServiceFlowParamSI              sfActiveSet;
 
-	B_UINT8 						u8CC;	/**<  Confirmation Code*/
-	B_UINT8 						u8Padd; 	/**<  8-bit Padding */
+	B_UINT8						u8CC;	/**<  Confirmation Code*/
+	B_UINT8						u8Padd;	/**<  8-bit Padding */
 	B_UINT16						u16Padd;	/**< 16 bit Padding */
 //    USE_MEMORY_MANAGER();
 }stLocalSFAddIndicationAlt;
@@ -66,7 +66,7 @@ typedef struct stLocalSFAddIndicationAlt{
 /// \brief structure stLocalSFAddConfirmation
 typedef struct stLocalSFAddConfirmationAlt{
 	B_UINT8                     u8Type;
-	B_UINT8      				u8Direction;
+	B_UINT8				u8Direction;
 	B_UINT16					u16TID;
 	/// \brief 16bitCID
 	B_UINT16                        u16CID;
@@ -102,8 +102,8 @@ typedef struct stLocalSFChangeRequestAlt{
 	/// \brief structure ParameterSet
 	stServiceFlowParamSI              sfActiveSet;
 
-	B_UINT8 						u8CC;	/**<  Confirmation Code*/
-	B_UINT8 						u8Padd; 	/**<  8-bit Padding */
+	B_UINT8						u8CC;	/**<  Confirmation Code*/
+	B_UINT8						u8Padd;	/**<  8-bit Padding */
 	B_UINT16						u16Padd;	/**< 16 bit */
 
 }stLocalSFChangeRequestAlt;
@@ -111,7 +111,7 @@ typedef struct stLocalSFChangeRequestAlt{
 /// \brief structure stLocalSFChangeConfirmation
 typedef struct stLocalSFChangeConfirmationAlt{
 	B_UINT8                         u8Type;
-	B_UINT8      					u8Direction;
+	B_UINT8					u8Direction;
 	B_UINT16						u16TID;
 	/// \brief 16bitCID
 	B_UINT16                        u16CID;
@@ -142,8 +142,8 @@ typedef struct stLocalSFChangeIndicationAlt{
 	/// \brief structure ActiveSet
 	stServiceFlowParamSI              sfActiveSet;
 
-	B_UINT8 						u8CC;	/**<  Confirmation Code*/
-	B_UINT8 						u8Padd; 	/**<  8-bit Padding */
+	B_UINT8						u8CC;	/**<  Confirmation Code*/
+	B_UINT8						u8Padd;	/**<  8-bit Padding */
 	B_UINT16						u16Padd;	/**< 16 bit */
 
 }stLocalSFChangeIndicationAlt;
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index 0d04643..02fa7a9 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -3,7 +3,7 @@
 
 
 #define DDR_DUMP_INTERNAL_DEVICE_MEMORY 0xBFC02B00
-#define MIPS_CLOCK_REG 	0x0f000820
+#define MIPS_CLOCK_REG	0x0f000820
 
 //DDR INIT-133Mhz
 #define T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 12  //index for 0x0F007000
diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index cddf47f..2d35d2d 100644
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -32,16 +32,16 @@
   Transmit.c ,Arp.c, LeakyBucket.c, And Qos.c
   total 17 macros */
 // Transmit.c
-#define TX 			1
-#define MP_SEND  	(TX<<0)
+#define TX			1
+#define MP_SEND	(TX<<0)
 #define NEXT_SEND   (TX<<1)
-#define TX_FIFO  	(TX<<2)
-#define TX_CONTROL 	(TX<<3)
+#define TX_FIFO	(TX<<2)
+#define TX_CONTROL	(TX<<3)
 
 // Arp.c
-#define IP_ADDR  	(TX<<4)
-#define ARP_REQ  	(TX<<5)
-#define ARP_RESP 	(TX<<6)
+#define IP_ADDR	(TX<<4)
+#define ARP_REQ	(TX<<5)
+#define ARP_RESP	(TX<<6)
 
 // dhcp.c
 //#define DHCP TX
@@ -51,15 +51,15 @@
 #define TOKEN_COUNTS (TX<<8)
 #define CHECK_TOKENS (TX<<9)
 #define TX_PACKETS   (TX<<10)
-#define TIMER  		 (TX<<11)
+#define TIMER		 (TX<<11)
 
 // Qos.c
 #define QOS TX
 #define QUEUE_INDEX (QOS<<12)
-#define IPV4_DBG 	(QOS<<13)
-#define IPV6_DBG 	(QOS<<14)
+#define IPV4_DBG	(QOS<<13)
+#define IPV6_DBG	(QOS<<14)
 #define PRUNE_QUEUE (QOS<<15)
-#define SEND_QUEUE 	(QOS<<16)
+#define SEND_QUEUE	(QOS<<16)
 
 //TX_Misc
 #define TX_OSAL_DBG (TX<<17)
@@ -69,25 +69,25 @@
 /*------------ TYPE is DBG_TYPE_INITEXIT -----//
   DriverEntry.c, bcmfwup.c, ChipDetectTask.c, HaltnReset.c, InterfaceDDR.c */
 #define MP 1
-#define DRV_ENTRY 	(MP<<0)
-#define MP_INIT  	(MP<<1)
-#define READ_REG 	(MP<<3)
-#define DISPATCH 	(MP<<2)
-#define CLAIM_ADAP 	(MP<<4)
+#define DRV_ENTRY	(MP<<0)
+#define MP_INIT	(MP<<1)
+#define READ_REG	(MP<<3)
+#define DISPATCH	(MP<<2)
+#define CLAIM_ADAP	(MP<<4)
 #define REG_IO_PORT (MP<<5)
-#define INIT_DISP 	(MP<<6)
-#define RX_INIT  	(MP<<7)
+#define INIT_DISP	(MP<<6)
+#define RX_INIT	(MP<<7)
 
 
 //-SUBTYPEs for --RX----------------------------------
 //------------RX  :  TYPE is DBG_TYPE_RX -----//
 // Receive.c
 #define RX 1
-#define RX_DPC  	(RX<<0)
-#define RX_CTRL 	(RX<<3)
-#define RX_DATA 	(RX<<4)
-#define MP_RETURN 	(RX<<1)
-#define LINK_MSG 	(RX<<2)
+#define RX_DPC	(RX<<0)
+#define RX_CTRL	(RX<<3)
+#define RX_DATA	(RX<<4)
+#define MP_RETURN	(RX<<1)
+#define LINK_MSG	(RX<<2)
 
 
 //-SUBTYPEs for ----OTHER ROUTINES------------------
@@ -102,52 +102,52 @@
 
 // HaltnReset.c
 #define HALT OTHERS
-#define MP_HALT  		(HALT<<1)
-#define CHECK_HANG 		(HALT<<2)
-#define MP_RESET 		(HALT<<3)
-#define MP_SHUTDOWN 	(HALT<<4)
+#define MP_HALT		(HALT<<1)
+#define CHECK_HANG		(HALT<<2)
+#define MP_RESET		(HALT<<3)
+#define MP_SHUTDOWN	(HALT<<4)
 
 // pnp.c
 #define PNP OTHERS
-#define MP_PNP  		(PNP<<5)
+#define MP_PNP		(PNP<<5)
 
 // Misc.c
 #define MISC OTHERS
-#define DUMP_INFO 		(MISC<<6)
-#define CLASSIFY 		(MISC<<7)
-#define LINK_UP_MSG 	(MISC<<8)
-#define CP_CTRL_PKT 	(MISC<<9)
-#define DUMP_CONTROL 	(MISC<<10)
-#define LED_DUMP_INFO 	(MISC<<11)
+#define DUMP_INFO		(MISC<<6)
+#define CLASSIFY		(MISC<<7)
+#define LINK_UP_MSG	(MISC<<8)
+#define CP_CTRL_PKT	(MISC<<9)
+#define DUMP_CONTROL	(MISC<<10)
+#define LED_DUMP_INFO	(MISC<<11)
 
 // CmHost.c
 #define CMHOST OTHERS
 
 
-#define SERIAL  		(OTHERS<<12)
-#define IDLE_MODE 		(OTHERS<<13)
+#define SERIAL		(OTHERS<<12)
+#define IDLE_MODE		(OTHERS<<13)
 
-#define WRM   			(OTHERS<<14)
-#define RDM   			(OTHERS<<15)
+#define WRM			(OTHERS<<14)
+#define RDM			(OTHERS<<15)
 
 // TODO - put PHS_SEND in Tx PHS_RECEIVE in Rx path ?
-#define PHS_SEND    	(OTHERS<<16)
-#define PHS_RECEIVE 	(OTHERS<<17)
-#define PHS_MODULE 	    (OTHERS<<18)
+#define PHS_SEND	(OTHERS<<16)
+#define PHS_RECEIVE	(OTHERS<<17)
+#define PHS_MODULE	    (OTHERS<<18)
 
-#define INTF_INIT    	(OTHERS<<19)
-#define INTF_ERR     	(OTHERS<<20)
-#define INTF_WARN    	(OTHERS<<21)
-#define INTF_NORM 		(OTHERS<<22)
+#define INTF_INIT	(OTHERS<<19)
+#define INTF_ERR	(OTHERS<<20)
+#define INTF_WARN	(OTHERS<<21)
+#define INTF_NORM		(OTHERS<<22)
 
-#define IRP_COMPLETION 	(OTHERS<<23)
+#define IRP_COMPLETION	(OTHERS<<23)
 #define SF_DESCRIPTOR_CNTS (OTHERS<<24)
-#define PHS_DISPATCH 	(OTHERS << 25)
-#define OSAL_DBG 		(OTHERS << 26)
-#define NVM_RW      	(OTHERS << 27)
+#define PHS_DISPATCH	(OTHERS << 25)
+#define OSAL_DBG		(OTHERS << 26)
+#define NVM_RW	(OTHERS << 27)
 
-#define HOST_MIBS   	(OTHERS << 28)
-#define CONN_MSG    	(CMHOST << 29)
+#define HOST_MIBS	(OTHERS << 28)
+#define CONN_MSG	(CMHOST << 29)
 //#define OTHERS_MISC		(OTHERS << 29)	// ProcSupport.c
 /*-----------------END SUBTYPEs------------------------------------------*/
 
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 4f8e7c8..ad7e8ff 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -140,27 +140,27 @@ typedef struct _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;
+	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;
 
 }S_MIBS_EXTSERVICEFLOW_PARAMETERS;
 
@@ -175,7 +175,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE
 	B_UINT8     u8TrafficPriority;
 
 	BOOLEAN		bValid;
-   	BOOLEAN     bActive;
+	BOOLEAN     bActive;
 	BOOLEAN		bActivateRequestSent;
 	//BE or rtPS
 	B_UINT8		u8QueueType;
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index 42abce9..f345f00 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -80,17 +80,17 @@ typedef struct _S_INTERFACE_ADAPTER
 
 	USB_TCB			asUsbTcb[MAXIMUM_USB_TCB];
 	USB_RCB			asUsbRcb[MAXIMUM_USB_RCB];
-	atomic_t	  	uNumTcbUsed;
+	atomic_t		uNumTcbUsed;
 	atomic_t		uCurrTcb;
 	atomic_t		uNumRcbUsed;
 	atomic_t		uCurrRcb;
 
 	PMINI_ADAPTER	psAdapter;
 	BOOLEAN                 bFlashBoot;
-	BOOLEAN 		bHighSpeedDevice ;
+	BOOLEAN		bHighSpeedDevice ;
 
-	BOOLEAN 		bSuspended;
-	BOOLEAN 		bPreparingForBusSuspend;
+	BOOLEAN		bSuspended;
+	BOOLEAN		bPreparingForBusSuspend;
 	struct work_struct usbSuspendWork;
 }S_INTERFACE_ADAPTER,*PS_INTERFACE_ADAPTER;
 
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 161cbcf..e0452a2 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -157,12 +157,12 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 
 static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
 {
-	int 	status = STATUS_SUCCESS;
+	int	status = STATUS_SUCCESS;
 	unsigned int value;
 	unsigned int chip_id ;
 	unsigned long timeout = 0 ,itr = 0;
 
-	int 	lenwritten = 0;
+	int	lenwritten = 0;
 	unsigned char aucAbortPattern[8]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 	PS_INTERFACE_ADAPTER psInterfaceAdapter = Adapter->pvInterfaceAdapter;
 
diff --git a/drivers/staging/bcm/InterfaceInit.h b/drivers/staging/bcm/InterfaceInit.h
index 058315a..123e9ab 100644
--- a/drivers/staging/bcm/InterfaceInit.h
+++ b/drivers/staging/bcm/InterfaceInit.h
@@ -1,20 +1,20 @@
 #ifndef _INTERFACE_INIT_H
 #define _INTERFACE_INIT_H
 
-#define BCM_USB_VENDOR_ID_T3 	0x198f
+#define BCM_USB_VENDOR_ID_T3	0x198f
 #define BCM_USB_VENDOR_ID_FOXCONN       0x0489
 #define BCM_USB_VENDOR_ID_ZTE   0x19d2
 
-#define BCM_USB_PRODUCT_ID_T3 	0x0300
-#define BCM_USB_PRODUCT_ID_T3B 	0x0210
-#define BCM_USB_PRODUCT_ID_T3L 	0x0220
-#define BCM_USB_PRODUCT_ID_SM250 	0xbccd
+#define BCM_USB_PRODUCT_ID_T3	0x0300
+#define BCM_USB_PRODUCT_ID_T3B	0x0210
+#define BCM_USB_PRODUCT_ID_T3L	0x0220
+#define BCM_USB_PRODUCT_ID_SM250	0xbccd
 #define BCM_USB_PRODUCT_ID_SYM  0x15E
 #define BCM_USB_PRODUCT_ID_1901 0xe017
 #define BCM_USB_PRODUCT_ID_226  0x0132
 #define BCM_USB_PRODUCT_ID_ZTE_TU25 0x0007
 
-#define BCM_USB_MINOR_BASE 		192
+#define BCM_USB_MINOR_BASE		192
 
 
 INT InterfaceInitialize(void);
diff --git a/drivers/staging/bcm/InterfaceMacros.h b/drivers/staging/bcm/InterfaceMacros.h
index 7001caf..c6d7037 100644
--- a/drivers/staging/bcm/InterfaceMacros.h
+++ b/drivers/staging/bcm/InterfaceMacros.h
@@ -4,7 +4,7 @@
 #define BCM_USB_MAX_READ_LENGTH 2048
 
 #define MAXIMUM_USB_TCB      128
-#define MAXIMUM_USB_RCB 	 128
+#define MAXIMUM_USB_RCB	 128
 
 #define MAX_BUFFERS_PER_QUEUE   256
 
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 2e5b174..f051e76 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -58,8 +58,8 @@ static void read_bulk_callback(struct urb *urb)
 	   (0 == urb->actual_length)
 		)
 	{
-	 	pRcb->bUsed = FALSE;
- 		atomic_dec(&psIntfAdapter->uNumRcbUsed);
+		pRcb->bUsed = FALSE;
+		atomic_dec(&psIntfAdapter->uNumRcbUsed);
 		return;
 	}
 
@@ -77,7 +77,7 @@ static void read_bulk_callback(struct urb *urb)
 				urb->status);
 		}
 		pRcb->bUsed = FALSE;
- 		atomic_dec(&psIntfAdapter->uNumRcbUsed);
+		atomic_dec(&psIntfAdapter->uNumRcbUsed);
 		urb->status = STATUS_SUCCESS ;
 		return ;
 	}
@@ -202,7 +202,7 @@ static void read_bulk_callback(struct urb *urb)
 				Adapter->aRxPktSizeHist[uiIndex]++;
 		}
 	}
- 	Adapter->PrevNumRecvDescs++;
+	Adapter->PrevNumRecvDescs++;
 	pRcb->bUsed = FALSE;
 	atomic_dec(&psIntfAdapter->uNumRcbUsed);
 }
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index 1607a93..60f568e 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -40,65 +40,65 @@ typedef struct stUserThreadReq
 
 ////********** ioctl codes ***********////
 
-#define BCM_IOCTL 				'k'
+#define BCM_IOCTL				'k'
 
 //1.Control code for CONTROL MESSAGES
 
-#define IOCTL_SEND_CONTROL_MESSAGE 			_IOW(BCM_IOCTL,	0x801,int)
+#define IOCTL_SEND_CONTROL_MESSAGE		_IOW(BCM_IOCTL,	0x801,int)
 
 //2.Control code to write a particular value to a particular register
-#define IOCTL_BCM_REGISTER_WRITE            _IOW(BCM_IOCTL, 0x802, int) //
+#define IOCTL_BCM_REGISTER_WRITE		_IOW(BCM_IOCTL, 0x802, int)
 
 //3.
-#define IOCTL_BCM_REGISTER_READ             _IOR(BCM_IOCTL, 0x803, int) //
+#define IOCTL_BCM_REGISTER_READ			_IOR(BCM_IOCTL, 0x803, int)
 
 //4.Control code to write x number of bytes to common memory
 //starting from address y
-#define IOCTL_BCM_COMMON_MEMORY_WRITE  	    _IOW(BCM_IOCTL, 0x804, int)//
+#define IOCTL_BCM_COMMON_MEMORY_WRITE		_IOW(BCM_IOCTL, 0x804, int)
 
 //5.Control code to write x number of bytes to common memory
 //starting from address y
-#define IOCTL_BCM_COMMON_MEMORY_READ 	    _IOR(BCM_IOCTL, 0x805, int)//
+#define IOCTL_BCM_COMMON_MEMORY_READ		_IOR(BCM_IOCTL, 0x805, int)
 
 //6.Control code for CONTROL MESSAGES
-#define IOCTL_GET_CONTROL_MESSAGE 			_IOR(BCM_IOCTL,	0x806, int)//
+#define IOCTL_GET_CONTROL_MESSAGE		_IOR(BCM_IOCTL,	0x806, int)
 
 //7.Control code for FIRMWARE DOWNLOAD
-#define IOCTL_BCM_FIRMWARE_DOWNLOAD 		_IOW(BCM_IOCTL, 0x807, int)//
+#define IOCTL_BCM_FIRMWARE_DOWNLOAD		_IOW(BCM_IOCTL, 0x807, int)
 
-#define IOCTL_BCM_SET_SEND_VCID 	        _IOW(BCM_IOCTL,	0x808, int)
+#define IOCTL_BCM_SET_SEND_VCID			_IOW(BCM_IOCTL, 0x808, int)
 
 //9.Control code for TRANSFER MODE SWITCHING
-#define IOCTL_BCM_SWITCH_TRANSFER_MODE 		_IOW(BCM_IOCTL, 0x809, int)
+#define IOCTL_BCM_SWITCH_TRANSFER_MODE		_IOW(BCM_IOCTL, 0x809, int)
 //10.Control code for LINK UP
-#define IOCTL_LINK_REQ 						_IOW(BCM_IOCTL, 0x80A, int)
+#define IOCTL_LINK_REQ				_IOW(BCM_IOCTL, 0x80A, int)
 
 //11.Control code for RSSI Level Request
-#define IOCTL_RSSI_LEVEL_REQ				_IOW(BCM_IOCTL, 0x80B, int)
+#define IOCTL_RSSI_LEVEL_REQ			_IOW(BCM_IOCTL, 0x80B, int)
 //12.Control code for IDLE MODE CONTROL
-#define IOCTL_IDLE_REQ						_IOW(BCM_IOCTL, 0x80C, int)
+#define IOCTL_IDLE_REQ				_IOW(BCM_IOCTL, 0x80C, int)
 //13.Control code for SS/BS info
-#define IOCTL_SS_INFO_REQ					_IOW(BCM_IOCTL, 0x80D, int)
+#define IOCTL_SS_INFO_REQ			_IOW(BCM_IOCTL, 0x80D, int)
 
 #define IOCTL_GET_STATISTICS_POINTER		_IOW(BCM_IOCTL, 0x80E, int)
 
-#define IOCTL_CM_REQUEST    				_IOW(BCM_IOCTL, 0x80F, int)
+#define IOCTL_CM_REQUEST			_IOW(BCM_IOCTL, 0x80F, int)
 
-#define IOCTL_INIT_PARAM_REQ 				_IOW(BCM_IOCTL, 0x810, int)
+#define IOCTL_INIT_PARAM_REQ			_IOW(BCM_IOCTL, 0x810, int)
 
-#define IOCTL_MAC_ADDR_REQ				_IOW(BCM_IOCTL, 0x811, int)
+#define IOCTL_MAC_ADDR_REQ			_IOW(BCM_IOCTL, 0x811, int)
 
-#define IOCTL_MAC_ADDR_RESP				_IOWR(BCM_IOCTL, 0x812, int)
+#define IOCTL_MAC_ADDR_RESP			_IOWR(BCM_IOCTL, 0x812, int)
 
-#define IOCTL_CLASSIFICATION_RULE	  	_IOW(BCM_IOCTL, 0x813, char)
+#define IOCTL_CLASSIFICATION_RULE		_IOW(BCM_IOCTL, 0x813, char)
 
 #define IOCTL_CLOSE_NOTIFICATION		_IO(BCM_IOCTL, 0x814)
 
-#define IOCTL_LINK_UP					_IO(BCM_IOCTL, 0x815)
+#define IOCTL_LINK_UP				_IO(BCM_IOCTL, 0x815)
 
-#define IOCTL_LINK_DOWN					_IO(BCM_IOCTL, 0x816, IOCTL_BUFFER)
+#define IOCTL_LINK_DOWN				_IO(BCM_IOCTL, 0x816, IOCTL_BUFFER)
 
-#define IOCTL_CHIP_RESET                _IO(BCM_IOCTL, 0x816)
+#define IOCTL_CHIP_RESET			_IO(BCM_IOCTL, 0x816)
 
 #define IOCTL_CINR_LEVEL_REQ			_IOW(BCM_IOCTL, 0x817, char)
 
@@ -108,82 +108,82 @@ typedef struct stUserThreadReq
 
 #define IOCTL_RTPS_BUCKET_SIZE			_IOW(BCM_IOCTL, 0x819, unsigned long)
 
-#define IOCTL_QOS_THRESHOLD				_IOW(BCM_IOCTL, 0x820, unsigned long)
+#define IOCTL_QOS_THRESHOLD			_IOW(BCM_IOCTL, 0x820, unsigned long)
 
-#define IOCTL_DUMP_PACKET_INFO				_IO(BCM_IOCTL, 0x821)
+#define IOCTL_DUMP_PACKET_INFO			_IO(BCM_IOCTL, 0x821)
 
-#define IOCTL_GET_PACK_INFO					_IOR(BCM_IOCTL, 0x823, int)
+#define IOCTL_GET_PACK_INFO			_IOR(BCM_IOCTL, 0x823, int)
 
 #define IOCTL_BCM_GET_DRIVER_VERSION		_IOR(BCM_IOCTL, 0x829, int)
 
-#define IOCTL_BCM_GET_CURRENT_STATUS 		_IOW(BCM_IOCTL, 0x828, int)
+#define IOCTL_BCM_GET_CURRENT_STATUS		_IOW(BCM_IOCTL, 0x828, int)
 
-#define IOCTL_BCM_GPIO_SET_REQUEST	  		_IOW(BCM_IOCTL, 0x82A, int)
+#define IOCTL_BCM_GPIO_SET_REQUEST		_IOW(BCM_IOCTL, 0x82A, int)
 
-#define IOCTL_BCM_GPIO_STATUS_REQUEST 		_IOW(BCM_IOCTL, 0x82b, int)
+#define IOCTL_BCM_GPIO_STATUS_REQUEST		_IOW(BCM_IOCTL, 0x82b, int)
 
-#define IOCTL_BCM_GET_DSX_INDICATION 		_IOR(BCM_IOCTL, 0x854, int)
+#define IOCTL_BCM_GET_DSX_INDICATION		_IOR(BCM_IOCTL, 0x854, int)
 
-#define IOCTL_BCM_BUFFER_DOWNLOAD_START 	_IOW(BCM_IOCTL, 0x855, int)
+#define IOCTL_BCM_BUFFER_DOWNLOAD_START		_IOW(BCM_IOCTL, 0x855, int)
 
-#define IOCTL_BCM_BUFFER_DOWNLOAD 			_IOW(BCM_IOCTL, 0x856, int)
+#define IOCTL_BCM_BUFFER_DOWNLOAD		_IOW(BCM_IOCTL, 0x856, int)
 
-#define IOCTL_BCM_BUFFER_DOWNLOAD_STOP 		_IOW(BCM_IOCTL, 0x857, int)
+#define IOCTL_BCM_BUFFER_DOWNLOAD_STOP		_IOW(BCM_IOCTL, 0x857, int)
 
-#define IOCTL_BCM_REGISTER_WRITE_PRIVATE 	_IOW(BCM_IOCTL, 0x826, char)
+#define IOCTL_BCM_REGISTER_WRITE_PRIVATE	_IOW(BCM_IOCTL, 0x826, char)
 
 #define IOCTL_BCM_REGISTER_READ_PRIVATE		_IOW(BCM_IOCTL, 0x827, char)
 
-#define IOCTL_BCM_SET_DEBUG                 _IOW(BCM_IOCTL, 0x824, IOCTL_BUFFER)
+#define IOCTL_BCM_SET_DEBUG			_IOW(BCM_IOCTL, 0x824, IOCTL_BUFFER)
 
-#define IOCTL_BCM_EEPROM_REGISTER_WRITE  	_IOW(BCM_IOCTL, 0x858, int)
+#define IOCTL_BCM_EEPROM_REGISTER_WRITE		_IOW(BCM_IOCTL, 0x858, int)
 
-#define IOCTL_BCM_EEPROM_REGISTER_READ     	_IOR(BCM_IOCTL, 0x859, int)
+#define IOCTL_BCM_EEPROM_REGISTER_READ		_IOR(BCM_IOCTL, 0x859, int)
 
 #define IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE	_IOR(BCM_IOCTL, 0x860, int)
 
-#define IOCTL_BCM_SET_MAC_TRACING     		_IOW(BCM_IOCTL, 0x82c, int)
+#define IOCTL_BCM_SET_MAC_TRACING		_IOW(BCM_IOCTL, 0x82c, int)
 
-#define IOCTL_BCM_GET_HOST_MIBS 		  	_IOW(BCM_IOCTL, 0x853, int)
+#define IOCTL_BCM_GET_HOST_MIBS			_IOW(BCM_IOCTL, 0x853, int)
 
-#define IOCTL_BCM_NVM_READ 					_IOR(BCM_IOCTL, 0x861, int)
+#define IOCTL_BCM_NVM_READ			_IOR(BCM_IOCTL, 0x861, int)
 
-#define IOCTL_BCM_NVM_WRITE					_IOW(BCM_IOCTL, 0x862, int)
+#define IOCTL_BCM_NVM_WRITE			_IOW(BCM_IOCTL, 0x862, int)
 
-#define IOCTL_BCM_GET_NVM_SIZE				_IOR(BCM_IOCTL, 0x863, int)
+#define IOCTL_BCM_GET_NVM_SIZE			_IOR(BCM_IOCTL, 0x863, int)
 
-#define IOCTL_BCM_CAL_INIT					_IOR(BCM_IOCTL, 0x864, int)
+#define IOCTL_BCM_CAL_INIT			_IOR(BCM_IOCTL, 0x864, int)
 
-#define IOCTL_BCM_BULK_WRM 					_IOW(BCM_IOCTL, 0x90B, int)
+#define IOCTL_BCM_BULK_WRM			_IOW(BCM_IOCTL, 0x90B, int)
 
-#define IOCTL_BCM_FLASH2X_SECTION_READ 		_IOR(BCM_IOCTL, 0x865, int)
+#define IOCTL_BCM_FLASH2X_SECTION_READ		_IOR(BCM_IOCTL, 0x865, int)
 
 #define IOCTL_BCM_FLASH2X_SECTION_WRITE		_IOW(BCM_IOCTL, 0x866, int)
 
-#define IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP _IOR(BCM_IOCTL,0x867, int)
+#define IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP	_IOR(BCM_IOCTL,0x867, int)
 
-#define IOCTL_BCM_SET_ACTIVE_SECTION 		_IOW(BCM_IOCTL,0x868, int)
+#define IOCTL_BCM_SET_ACTIVE_SECTION		_IOW(BCM_IOCTL,0x868, int)
 
-#define	IOCTL_BCM_IDENTIFY_ACTIVE_SECTION 	_IO(BCM_IOCTL,0x869)
+#define	IOCTL_BCM_IDENTIFY_ACTIVE_SECTION	_IO(BCM_IOCTL,0x869)
 
-#define IOCTL_BCM_COPY_SECTION 				_IOW(BCM_IOCTL, 0x870,int)
+#define IOCTL_BCM_COPY_SECTION			_IOW(BCM_IOCTL, 0x870,int)
 
-#define	IOCTL_BCM_GET_FLASH_CS_INFO 		_IOR(BCM_IOCTL, 0x871, int)
+#define	IOCTL_BCM_GET_FLASH_CS_INFO		_IOR(BCM_IOCTL, 0x871, int)
 
-#define IOCTL_BCM_SELECT_DSD 				_IOW(BCM_IOCTL, 0x872, int)
+#define IOCTL_BCM_SELECT_DSD			_IOW(BCM_IOCTL, 0x872, int)
 
-#define IOCTL_BCM_NVM_RAW_READ  			_IOR(BCM_IOCTL, 0x875, int)
+#define IOCTL_BCM_NVM_RAW_READ			_IOR(BCM_IOCTL, 0x875, int)
 
-#define IOCTL_BCM_CNTRLMSG_MASK  			_IOW(BCM_IOCTL, 0x874, int)
+#define IOCTL_BCM_CNTRLMSG_MASK			_IOW(BCM_IOCTL, 0x874, int)
 
-#define IOCTL_BCM_GET_DEVICE_DRIVER_INFO  _IOR(BCM_IOCTL, 0x877, int)
+#define IOCTL_BCM_GET_DEVICE_DRIVER_INFO	_IOR(BCM_IOCTL, 0x877, int)
 
-#define IOCTL_BCM_TIME_SINCE_NET_ENTRY  _IOR(BCM_IOCTL, 0x876, int)
+#define IOCTL_BCM_TIME_SINCE_NET_ENTRY		_IOR(BCM_IOCTL, 0x876, int)
 
-#define BCM_LED_THREAD_STATE_CHANGE_REQ	  _IOW(BCM_IOCTL, 0x878, int)
+#define BCM_LED_THREAD_STATE_CHANGE_REQ		_IOW(BCM_IOCTL, 0x878, int)
 
 #define IOCTL_BCM_GPIO_MULTI_REQUEST		_IOW(BCM_IOCTL, 0x82D, IOCTL_BUFFER)
-#define IOCTL_BCM_GPIO_MODE_REQUEST			_IOW(BCM_IOCTL, 0x82E, IOCTL_BUFFER)
+#define IOCTL_BCM_GPIO_MODE_REQUEST		_IOW(BCM_IOCTL, 0x82E, IOCTL_BUFFER)
 
 
 
@@ -198,12 +198,12 @@ typedef enum _BCM_INTERFACE_TYPE
 
 typedef struct _DEVICE_DRIVER_INFO
 {
-	NVM_TYPE 			u32NVMType;
-	UINT 				MaxRDMBufferSize;
-	BCM_INTERFACE_TYPE 	u32InterfaceType;
-	UINT 				u32DSDStartOffset;
+	NVM_TYPE			u32NVMType;
+	UINT				MaxRDMBufferSize;
+	BCM_INTERFACE_TYPE	u32InterfaceType;
+	UINT				u32DSDStartOffset;
 	UINT				u32RxAlignmentCorrection;
-	UINT 				u32Reserved[10];
+	UINT				u32Reserved[10];
 } DEVICE_DRIVER_INFO;
 
 typedef  struct _NVM_READWRITE
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index d1b1907..e77ba7e0 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -1,5 +1,5 @@
 /**********************************************************************
- * 			LEAKYBUCKET.C
+ *			LEAKYBUCKET.C
  *	This file contains the routines related to Leaky Bucket Algorithm.
  ***********************************************************************/
 #include "headers.h"
@@ -17,8 +17,8 @@
 
 static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
 {
-	ULONG 	liCurrentTime;
-	INT 	i = 0;
+	ULONG	liCurrentTime;
+	INT	i = 0;
 	struct timeval tv;
 
 	bcm_dbg(Adapter, TX, TOKEN_COUNTS, ALL, "=====>\n");
@@ -70,8 +70,8 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
  *				checking the token count.
  *
  * Parameters  - Adapter	      :	Pointer to the Adpater structure.
- * 			  - iQIndex	      :	The queue Identifier.
- * 			  - ulPacketLength:	Number of bytes to be transmitted.
+ *			  - iQIndex	      :	The queue Identifier.
+ *			  - ulPacketLength:	Number of bytes to be transmitted.
  *
  * Returns     - The number of bytes allowed for transmission.
  *
@@ -123,7 +123,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
 			       PacketInfo *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_dbg(Adapter, TX, SEND_QUEUE, ALL, "=====>\n");
@@ -159,7 +159,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
  *				specified queue for transmission.
  *
  * Parameters  - Adapter : Pointer to the driver control structure.
- * 			  - iQIndex : The queue Identifier.
+ *			  - iQIndex : The queue Identifier.
  *
  * Returns     - None.
  *
@@ -167,7 +167,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
 static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 {
 	struct sk_buff	*QueuePacket=NULL;
-	char 			*pControlPacket = NULL;
+	char			*pControlPacket = NULL;
 	INT				Status=0;
 	int				iPacketLen=0;
 
@@ -175,7 +175,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 	bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 		"%zd ====>\n", (psSF-Adapter->PackInfo));
 	if((psSF != &Adapter->PackInfo[HiPriority]) && Adapter->LinkUpStatus && atomic_read(&psSF->uiPerSFTxResourceCount))//Get data packet
-  	{
+	{
 		if(!psSF->ucDirection )
 			return;
 
@@ -218,7 +218,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 				atomic_dec(&Adapter->TotalPacketCount);
 				spin_unlock_bh(&psSF->SFQueueLock);
 
-			   	Status = SendPacketFromQueue(Adapter, psSF, QueuePacket);
+				Status = SendPacketFromQueue(Adapter, psSF, QueuePacket);
 				psSF->uiPendedLast = FALSE;
 			}
 			else
@@ -277,7 +277,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
 				bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 					"Control Pkt is not available, Indexing is wrong....\n");
 			}
-	   	}
+		}
 	}
 }
 
@@ -294,7 +294,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
  ********************************************************************/
 VOID transmit_packets(PMINI_ADAPTER Adapter)
 {
-	UINT 	uiPrevTotalCount = 0;
+	UINT	uiPrevTotalCount = 0;
 	int iIndex = 0;
 
 	BOOLEAN exit_flag = TRUE ;
diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index 9a0e933..a32ff41 100644
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -17,7 +17,7 @@
 #define VERIFY						0
 #define SIZE_MULTIPLE_32             4
 #define UNCOMPRESSED_PACKET			 0
-#define DYNAMIC         			 0
+#define DYNAMIC			 0
 #define SUPPRESS					 0x80
 #define NO_CLASSIFIER_MATCH			 0
 #define SEND_PACKET_UNCOMPRESSED	 0
@@ -65,9 +65,9 @@ typedef struct _S_PHS_RULE
 
 	B_UINT8							u8Reserved[3];
 
-  	LONG							PHSModifiedBytes;
-	ULONG       				PHSModifiedNumPackets;
-	ULONG           			PHSErrorNumPackets;
+	LONG							PHSModifiedBytes;
+	ULONG				PHSModifiedNumPackets;
+	ULONG			PHSErrorNumPackets;
 }S_PHS_RULE;
 
 
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index cb0ab32..dd6ad51 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -59,7 +59,7 @@ static ULONG PhsDeCompress(void* pvContext,
 
 
   Input parameters:		IN PMINI_ADAPTER Adapter         - Miniport Adapter Context
-  IN Packet 				- NDIS packet containing data to be transmitted
+  IN Packet				- NDIS packet containing data to be transmitted
   IN USHORT Vcid        - vcid pertaining to connection on which the packet is being sent.Used to
   identify PHS rule to be applied.
   B_UINT16 uiClassifierRuleID - Classifier Rule ID
@@ -92,7 +92,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
 	UINT       BytesToRemove=0;
 	BOOLEAN  bPHSI = 0;
 	LONG ulPhsStatus = 0;
-	UINT 	numBytesCompressed = 0;
+	UINT	numBytesCompressed = 0;
 	struct sk_buff *newPacket = NULL;
 	struct sk_buff *Packet = *pPacket;
 
@@ -222,9 +222,9 @@ int PHSReceive(PMINI_ADAPTER Adapter,
 	       UCHAR *pucEthernetHdr,
 	       UINT	bHeaderSuppressionEnabled)
 {
-	u32   nStandardPktHdrLen            		= 0;
+	u32   nStandardPktHdrLen		= 0;
 	u32   nTotalsupressedPktHdrBytes  = 0;
-	int     ulPhsStatus 		= 0;
+	int     ulPhsStatus		= 0;
 	PUCHAR pucInBuff = NULL ;
 	UINT TotalBytesAdded = 0;
 	if(!bHeaderSuppressionEnabled)
@@ -446,7 +446,7 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
 	}
 
 	/* SF already Exists Add PHS Rule to existing SF */
-  	lStatus = CreateClassiferToPHSRuleMapping(uiVcid, uiClsId,
+	lStatus = CreateClassiferToPHSRuleMapping(uiVcid, uiClsId,
 						  pstServiceFlowEntry, psPhsRule, u8AssociatedPHSI);
 
 	return lStatus;
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index d56e462..879d3e6 100644
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -1,5 +1,5 @@
 /************************************
- * 	Protocol.h
+ *	Protocol.h
  *************************************/
 #ifndef	__PROTOCOL_H__
 #define	__PROTOCOL_H__
@@ -86,8 +86,8 @@ typedef struct _ETH_CS_ETH2_FRAME
 } __attribute__((packed)) ETH_CS_ETH2_FRAME;
 
 #define ETHERNET_FRAMETYPE_IPV4		ntohs(0x0800)
-#define ETHERNET_FRAMETYPE_IPV6 	ntohs(0x86dd)
-#define ETHERNET_FRAMETYPE_802QVLAN 	ntohs(0x8100)
+#define ETHERNET_FRAMETYPE_IPV6	ntohs(0x86dd)
+#define ETHERNET_FRAMETYPE_802QVLAN	ntohs(0x8100)
 
 //Per SF CS Specification Encodings
 typedef enum _E_SERVICEFLOW_CS_SPEC_
@@ -123,8 +123,8 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_
 #define	ETH_ARP_FRAME			0x806
 #define	ETH_IPV4_FRAME			0x800
 #define	ETH_IPV6_FRAME			0x86DD
-#define UDP 					0x11
-#define TCP         			0x06
+#define UDP					0x11
+#define TCP			0x06
 
 #define	ARP_OP_REQUEST			0x01
 #define	ARP_OP_REPLY			0x02
@@ -143,7 +143,7 @@ typedef struct _TCP_HEADER
 	USHORT usChkSum;
 	USHORT usUrgetPtr;
 } TCP_HEADER,*PTCP_HEADER;
-#define TCP_HEADER_LEN  	sizeof(TCP_HEADER)
+#define TCP_HEADER_LEN	sizeof(TCP_HEADER)
 #define TCP_ACK             0x10  //Bit 4 in tcpflags field.
 #define GET_TCP_HEADER_LEN(byte) ((byte&0xF0)>>4)
 
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 66ed077..322d3c9 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -20,13 +20,13 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex);
  *				matches with that of Queue.
  *
  * Parameters  - pstClassifierRule: Pointer to the packet info structure.
- * 			  - ulSrcIP	    : Source IP address from the packet.
+ *			  - ulSrcIP	    : Source IP address from the packet.
  *
  * Returns     - TRUE(If address matches) else FAIL .
  *********************************************************************/
 BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP)
 {
-	UCHAR 	ucLoopIndex=0;
+	UCHAR	ucLoopIndex=0;
 
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
@@ -47,7 +47,7 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP)
 		}
 	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Src Ip Address Not Matched\n");
-   	return FALSE;
+	return FALSE;
 }
 
 
@@ -58,13 +58,13 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP)
  *				matches with that of Queue.
  *
  * Parameters  - pstClassifierRule: Pointer to the packet info structure.
- * 			  - ulDestIP    : Destination IP address from the packet.
+ *			  - ulDestIP    : Destination IP address from the packet.
  *
  * Returns     - TRUE(If address matches) else FAIL .
  *********************************************************************/
 BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP)
 {
-	UCHAR 	ucLoopIndex=0;
+	UCHAR	ucLoopIndex=0;
 	PMINI_ADAPTER	Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 	ulDestIP=ntohl(ulDestIP);
@@ -96,7 +96,7 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP)
  * Description - Checks the TOS from the packet matches with that of queue.
  *
  * Parameters  - pstClassifierRule   : Pointer to the packet info structure.
- * 			  - ucTypeOfService: TOS from the packet.
+ *			  - ucTypeOfService: TOS from the packet.
  *
  * Returns     - TRUE(If address matches) else FAIL.
  **************************************************************************/
@@ -122,13 +122,13 @@ BOOLEAN MatchTos(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucTypeOfService)
  * Description - Checks the protocol from the packet matches with that of queue.
  *
  * Parameters  - pstClassifierRule: Pointer to the packet info structure.
- * 			  - ucProtocol	: Protocol from the packet.
+ *			  - ucProtocol	: Protocol from the packet.
  *
  * Returns     - TRUE(If address matches) else FAIL.
  ****************************************************************************/
 BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol)
 {
-   	UCHAR 	ucLoopIndex=0;
+	UCHAR	ucLoopIndex=0;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 	if(0 == pstClassifierRule->ucProtocolLength)
 		return TRUE;
@@ -143,7 +143,7 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol)
 		}
 	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Protocol Not Matched\n");
-   	return FALSE;
+	return FALSE;
 }
 
 
@@ -153,30 +153,30 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol)
  * Description - Checks, Source port from the packet matches with that of queue.
  *
  * Parameters  - pstClassifierRule: Pointer to the packet info structure.
- * 			  - ushSrcPort	: Source port from the packet.
+ *			  - ushSrcPort	: Source port from the packet.
  *
  * Returns     - TRUE(If address matches) else FAIL.
  ***************************************************************************/
 BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
 {
-    	UCHAR 	ucLoopIndex=0;
+	UCHAR	ucLoopIndex=0;
 
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
 
-    	if(0 == pstClassifierRule->ucSrcPortRangeLength)
-        	return TRUE;
-    	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucSrcPortRangeLength;ucLoopIndex++)
-    	{
-        	if(ushSrcPort <= pstClassifierRule->usSrcPortRangeHi[ucLoopIndex] &&
+	if(0 == pstClassifierRule->ucSrcPortRangeLength)
+	return TRUE;
+	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucSrcPortRangeLength;ucLoopIndex++)
+	{
+	if(ushSrcPort <= pstClassifierRule->usSrcPortRangeHi[ucLoopIndex] &&
 		   ushSrcPort >= pstClassifierRule->usSrcPortRangeLo[ucLoopIndex])
-	    	{
-		    	return TRUE;
-	    	}
-    	}
+		{
+			return TRUE;
+		}
+	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 		"Src Port: %x Not Matched\n", ushSrcPort);
-    	return FALSE;
+	return FALSE;
 }
 
 
@@ -186,35 +186,35 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort)
  * Description - Checks, Destination port from packet matches with that of queue.
  *
  * Parameters  - pstClassifierRule: Pointer to the packet info structure.
- * 			  - ushDestPort	: Destination port from the packet.
+ *			  - ushDestPort	: Destination port from the packet.
  *
  * Returns     - TRUE(If address matches) else FAIL.
  ***************************************************************************/
 BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort)
 {
-    	UCHAR 	ucLoopIndex=0;
+	UCHAR	ucLoopIndex=0;
 	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
 
-    	if(0 == pstClassifierRule->ucDestPortRangeLength)
-        	return TRUE;
+	if(0 == pstClassifierRule->ucDestPortRangeLength)
+	return TRUE;
 
-    	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucDestPortRangeLength;ucLoopIndex++)
-    	{
+	for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucDestPortRangeLength;ucLoopIndex++)
+	{
 		bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 			"Matching Port:0x%X   0x%X  0x%X\n",
 			ushDestPort,
 			pstClassifierRule->usDestPortRangeLo[ucLoopIndex],
 			pstClassifierRule->usDestPortRangeHi[ucLoopIndex]);
 
- 		if(ushDestPort <= pstClassifierRule->usDestPortRangeHi[ucLoopIndex] &&
+		if(ushDestPort <= pstClassifierRule->usDestPortRangeHi[ucLoopIndex] &&
 		   ushDestPort >= pstClassifierRule->usDestPortRangeLo[ucLoopIndex])
-	    	{
+		{
 			return TRUE;
-	    	}
-    	}
+		}
+	}
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL,
 		"Dest Port: %x Not Matched\n", ushDestPort);
-    	return FALSE;
+	return FALSE;
 }
 /**
    @ingroup tx_functions
@@ -225,7 +225,7 @@ static USHORT	IpVersion4(PMINI_ADAPTER Adapter,
 			   struct iphdr *iphd,
 			   S_CLASSIFIER_RULE *pstClassifierRule )
 {
-	xporthdr     		*xprt_hdr=NULL;
+	xporthdr		*xprt_hdr=NULL;
 	BOOLEAN	bClassificationSucceed=FALSE;
 
 	bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "========>\n");
@@ -352,7 +352,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 
 	bcm_dbg(Adapter, TX, PRUNE_QUEUE, ALL, "=====> Index %d\n", iIndex);
 
-   	if(iIndex == HiPriority)
+	if(iIndex == HiPriority)
 		return;
 
 	if(!Adapter || (iIndex < 0) || (iIndex > HiPriority))
@@ -473,7 +473,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 	S_CLASSIFIER_RULE *pstClassifierRule = NULL;
 	S_ETHCS_PKT_INFO stEthCsPktInfo;
 	PVOID pvEThPayload = NULL;
-	struct iphdr 		*pIpHeader = NULL;
+	struct iphdr		*pIpHeader = NULL;
 	INT	  uiSfIndex=0;
 	USHORT	usIndex=Adapter->usBestEffortQueueIndex;
 	BOOLEAN	bFragmentedPkt=FALSE,bClassificationSucceed=FALSE;
diff --git a/drivers/staging/bcm/Queue.h b/drivers/staging/bcm/Queue.h
index 0721633..7aede02 100644
--- a/drivers/staging/bcm/Queue.h
+++ b/drivers/staging/bcm/Queue.h
@@ -1,5 +1,5 @@
 /*************************************
- * 	Queue.h
+ *	Queue.h
  **************************************/
 #ifndef	__QUEUE_H__
 #define	__QUEUE_H__
@@ -11,14 +11,14 @@
 	{                                               \
 		if (!_Head) {                           \
 			_Head = _Packet;                \
-		} 					\
+		}					\
 		else {                                  \
-			(_Tail)->next = _Packet; 	\
+			(_Tail)->next = _Packet;	\
 		}                                       \
-		(_Packet)->next = NULL;  		\
+		(_Packet)->next = NULL;		\
 		_Tail = _Packet;                        \
 	}while(0)
-#define DEQUEUEPACKET(Head, Tail )            	\
+#define DEQUEUEPACKET(Head, Tail )	\
 	do					\
 	{   if(Head)				\
 		{				\
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index edd776d..ff0527a 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -253,7 +253,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
 		{
 			bcm_dbg(Adapter, TX, TX_PACKETS, ALL,
 				"Device in Low Power mode...waking up\n");
-    			Adapter->usIdleModePattern = ABORT_IDLE_MODE;
+			Adapter->usIdleModePattern = ABORT_IDLE_MODE;
 			Adapter->bWakeUpDevice = TRUE;
 			wake_up(&Adapter->process_rx_cntrlpkt);
 		}
diff --git a/drivers/staging/bcm/Version.h b/drivers/staging/bcm/Version.h
index 5f1e522..e4e549c 100644
--- a/drivers/staging/bcm/Version.h
+++ b/drivers/staging/bcm/Version.h
@@ -32,4 +32,4 @@
 
 //#include "common.ver"
 
-#endif 	//VERSION_H
+#endif	//VERSION_H
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 0d1628c..3145d7d 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -160,7 +160,7 @@ typedef struct _stServiceFlowParamSI{
 	B_UINT32                        u32MinReservedTrafficRate;
 
 	/**  32bit Tolerated Jitter of the Service Flow*/
-    	B_UINT32                        u32ToleratedJitter;
+	B_UINT32                        u32ToleratedJitter;
 
 	/**  32bit Maximum Latency of the Service Flow*/
 	B_UINT32                        u32MaximumLatency;
@@ -174,10 +174,10 @@ typedef struct _stServiceFlowParamSI{
 	/** 16bit  ARQ window size negotiated*/
 	B_UINT16                        u16ARQWindowSize;
 
-	/**  16bit Total Tx delay incl sending, receiving & processing delays 	*/
+	/**  16bit Total Tx delay incl sending, receiving & processing delays	*/
 	B_UINT16                        u16ARQRetryTxTimeOut;
 
-	/**  16bit Total Rx delay incl sending, receiving & processing delays 	*/
+	/**  16bit Total Rx delay incl sending, receiving & processing delays	*/
 	B_UINT16                        u16ARQRetryRxTimeOut;
 
 	/**  16bit ARQ block lifetime	*/
@@ -196,7 +196,7 @@ typedef struct _stServiceFlowParamSI{
 	/**  16bit Nominal interval b/w consecutive SDU arrivals at MAC SAP*/
 	B_UINT16                        u16SDUInterArrivalTime;
 
-	/**  16bit Specifies the time base for rate measurement 	*/
+	/**  16bit Specifies the time base for rate measurement	*/
 	B_UINT16                        u16TimeBase;
 
 	/** 16bit Interval b/w Successive Grant oppurtunities*/
@@ -277,7 +277,7 @@ typedef struct _stServiceFlowParamSI{
 	/**  Indicates the size of the Fragment Sequence Number for the connection	*/
 	B_UINT8                         u8FSNSize;
 
-	/** 8bit Number of CIDs in active BS list 	*/
+	/** 8bit Number of CIDs in active BS list	*/
 	B_UINT8							u8CIDAllocation4activeBSsLength;
 
 	/**  CIDs of BS in the active list	*/
@@ -330,7 +330,7 @@ typedef struct _stLocalSFAddRequest{
 	/// \brief 16 bit TID
 	B_UINT16                        u16TID;	/**<  16bit TID*/
 	/// \brief 16bitCID
-    	B_UINT16                        u16CID;	/**<  16bit CID*/
+	B_UINT16                        u16CID;	/**<  16bit CID*/
 	/// \brief 16bitVCID
 	B_UINT16                        u16VCID;	/**<  16bit VCID*/
 	/// \brief structure ParameterSet
@@ -403,7 +403,7 @@ typedef struct stLocalSFDeleteIndication{
 	/// \brief 16bitVCID
 	B_UINT16                        u16VCID;		/**< VCID */
 	/// \brief 32bitSFID
-	B_UINT32                        u32SFID; 		/**< SFID */
+	B_UINT32                        u32SFID;		/**< SFID */
 	/// \brief 8bit Confirmation code
 	B_UINT8                         u8ConfirmationCode;	/**< Confirmation code */
 	B_UINT8                         u8Padding1[3];		/**< 3 byte Padding  */
@@ -411,12 +411,12 @@ typedef struct stLocalSFDeleteIndication{
 
 typedef struct _stIM_SFHostNotify
 {
-	B_UINT32 	SFID;      //SFID of the service flow
-	B_UINT16 	newCID;   //the new/changed CID
-	B_UINT16 	VCID;             //Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid
-	B_UINT8  	RetainSF;        //Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete
-	B_UINT8 	QoSParamSet; //QoS paramset of the retained SF
-	B_UINT16 	u16reserved;  //For byte alignment
+	B_UINT32	SFID;      //SFID of the service flow
+	B_UINT16	newCID;   //the new/changed CID
+	B_UINT16	VCID;             //Get new Vcid if the flow has been made active in CID update TLV, but was inactive earlier or the orig vcid
+	B_UINT8	RetainSF;        //Indication to Host if the SF is to be retained or deleted; if TRUE-retain else delete
+	B_UINT8	QoSParamSet; //QoS paramset of the retained SF
+	B_UINT16	u16reserved;  //For byte alignment
 
 } stIM_SFHostNotify;
 
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index fdba67a..d17e9d7 100644
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -1,6 +1,6 @@
 
 /*******************************************************************
- * 		Headers.h
+ *		Headers.h
  *******************************************************************/
 #ifndef __HEADERS_H__
 #define __HEADERS_H__
diff --git a/drivers/staging/bcm/led_control.h b/drivers/staging/bcm/led_control.h
index 63ca9fa..78e0646 100644
--- a/drivers/staging/bcm/led_control.h
+++ b/drivers/staging/bcm/led_control.h
@@ -5,10 +5,10 @@
 #define NUM_OF_LEDS 4
 
 #define DSD_START_OFFSET                     0x0200
-#define EEPROM_VERSION_OFFSET           	 0x020E
-#define EEPROM_HW_PARAM_POINTER_ADDRESS 	 0x0218
+#define EEPROM_VERSION_OFFSET	 0x020E
+#define EEPROM_HW_PARAM_POINTER_ADDRESS	 0x0218
 #define EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5 0x0220
-#define GPIO_SECTION_START_OFFSET        	 0x03
+#define GPIO_SECTION_START_OFFSET	 0x03
 
 #define COMPATIBILITY_SECTION_LENGTH         42
 #define COMPATIBILITY_SECTION_LENGTH_MAP5    84
@@ -18,13 +18,13 @@
 #define EEPROM_MAP5_MINORVERSION             0
 
 
-#define MAX_NUM_OF_BLINKS 					10
-#define NUM_OF_GPIO_PINS 					16
+#define MAX_NUM_OF_BLINKS					10
+#define NUM_OF_GPIO_PINS					16
 
-#define DISABLE_GPIO_NUM 					0xFF
-#define EVENT_SIGNALED 						1
+#define DISABLE_GPIO_NUM					0xFF
+#define EVENT_SIGNALED						1
 
-#define MAX_FILE_NAME_BUFFER_SIZE 			100
+#define MAX_FILE_NAME_BUFFER_SIZE			100
 
 #define TURN_ON_LED(GPIO, index) do{					\
 		UINT gpio_val = GPIO;					\
@@ -50,7 +50,7 @@ typedef enum _LEDColors{
 	BLUE_LED = 2,
 	YELLOW_LED = 3,
 	GREEN_LED = 4
-} LEDColors; 				/*Enumerated values of different LED types*/
+} LEDColors;				/*Enumerated values of different LED types*/
 
 typedef enum LedEvents {
 	SHUTDOWN_EXIT = 0x00,
@@ -77,7 +77,7 @@ typedef struct LedStateInfo_t
 	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
+	UCHAR			BitPolarity;				/*To represent whether H/W is normal polarity or reverse
 									  polarity*/
 }LEDStateInfo, *pLEDStateInfo;
 
@@ -85,19 +85,19 @@ typedef struct LedStateInfo_t
 typedef struct _LED_INFO_STRUCT
 {
 	LEDStateInfo	LEDState[NUM_OF_LEDS];
-	BOOLEAN 		bIdleMode_tx_from_host; /*Variable to notify whether driver came out
+	BOOLEAN		bIdleMode_tx_from_host; /*Variable to notify whether driver came out
 							  from idlemode due to Host or target*/
 	BOOLEAN			bIdle_led_off;
 	wait_queue_head_t   notify_led_event;
 	wait_queue_head_t	idleModeSyncEvent;
- 	struct task_struct  *led_cntrl_threadid;
+	struct task_struct  *led_cntrl_threadid;
 	int                 led_thread_running;
 	BOOLEAN			bLedInitDone;
 
 } LED_INFO_STRUCT, *PLED_INFO_STRUCT;
 //LED Thread state.
-#define BCM_LED_THREAD_DISABLED			 	 0 //LED Thread is not running.
-#define BCM_LED_THREAD_RUNNING_ACTIVELY  	 1 //LED thread is running.
+#define BCM_LED_THREAD_DISABLED				 0 //LED Thread is not running.
+#define BCM_LED_THREAD_RUNNING_ACTIVELY	 1 //LED thread is running.
 #define BCM_LED_THREAD_RUNNING_INACTIVELY	 2 //LED thread has been put on hold
 
 
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index d32ae75..03b88f3 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -264,7 +264,7 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
 		      DWORD *pBuffer
 	)
 {
-	UINT uiData[8]	 	= {0};
+	UINT uiData[8]		= {0};
 	UINT uiByteOffset	= 0;
 	UINT uiTempOffset	= 0;
 
@@ -328,10 +328,10 @@ INT BeceemEEPROMBulkRead(
 	UINT uiNumBytes)
 {
 	UINT uiData[4]		  = {0};
-	//UINT uiAddress 		  = 0;
+	//UINT uiAddress		  = 0;
 	UINT uiBytesRemaining = uiNumBytes;
-	UINT uiIndex 		  = 0;
-	UINT uiTempOffset  	  = 0;
+	UINT uiIndex		  = 0;
+	UINT uiTempOffset	  = 0;
 	UINT uiExtraBytes     = 0;
 	UINT uiFailureRetries = 0;
 	PUCHAR pcBuff = (PUCHAR)pBuffer;
@@ -525,7 +525,7 @@ static INT BeceemFlashBulkRead(
 static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
 {
 	if(IsFlash2x(Adapter))
-		return 	(Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
+		return	(Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
 	else
 		return 32*1024;
 
@@ -722,19 +722,19 @@ static INT flashByteWrite(
 	do
 	{
 		value = (FLASH_CMD_STATUS_REG_READ << 24);
-	  	if(wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)) < 0)
-	  	{
+		if(wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)) < 0)
+		{
 			pr_info("Programing of FLASH_SPI_CMDQ_REG fails\n");
 			return STATUS_FAILURE;
-	  	}
-	  	//__udelay(1);
+		}
+		//__udelay(1);
 		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
 		if (bytes < 0) {
 			uiStatus = bytes;
 			pr_info("Reading status of FLASH_SPI_READQ_REG fails\n");
 			return uiStatus;
 		}
-	  	iRetries--;
+		iRetries--;
 		if( iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
 			msleep(1);
 
@@ -807,12 +807,12 @@ static INT flashWrite(
 	do
 	{
 		value = (FLASH_CMD_STATUS_REG_READ << 24);
-	  	if(wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)) < 0)
-	  	{
+		if(wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)) < 0)
+		{
 			pr_info("Programing of FLASH_SPI_CMDQ_REG fails\n");
 			return STATUS_FAILURE;
-	  	}
-	  	//__udelay(1);
+		}
+		//__udelay(1);
 		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
 		if (bytes < 0) {
 			uiStatus = bytes;
@@ -975,19 +975,19 @@ static INT flashWriteStatus(
 	do
 	{
 		value = (FLASH_CMD_STATUS_REG_READ << 24);
-	  	if(wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)) < 0)
-	  	{
+		if(wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)) < 0)
+		{
 			pr_info("Programming of FLASH_SPI_CMDQ_REG fails\n");
 			return STATUS_FAILURE;
-	  	}
-	  	//__udelay(1);
+		}
+		//__udelay(1);
 		bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
 		if (bytes < 0) {
 			uiStatus = bytes;
 			pr_info("Reading status of FLASH_SPI_READQ_REG fails\n");
 			return uiStatus;
 		}
-	  	iRetries--;
+		iRetries--;
 		//this will ensure that in there will be no changes in the current path.
 		//currently one rdm/wrm takes 125 us.
 		//Hence  125 *2  * FLASH_PER_RETRIES_DELAY  >3 ms(worst case delay)
@@ -1140,7 +1140,7 @@ static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter,UINT uiOffset, UINT ui
 //
 // Arguments:
 //		Adapter    - ptr to Adapter object instance
-//		pBuffer 	- Data to be written.
+//		pBuffer	- Data to be written.
 //		uiOffset   - Offset of the flash where data needs to be written to.
 //		uiNumBytes - Number of bytes to be written.
 //		bVerify    - read verify flag.
@@ -1156,34 +1156,34 @@ static INT BeceemFlashBulkWrite(
 	UINT uiNumBytes,
 	BOOLEAN bVerify)
 {
-	PCHAR  pTempBuff 			= NULL;
+	PCHAR  pTempBuff			= NULL;
 	PUCHAR pcBuffer             = (PUCHAR)pBuffer;
 	UINT  uiIndex				= 0;
 	UINT  uiOffsetFromSectStart = 0;
 	UINT  uiSectAlignAddr		= 0;
 	UINT  uiCurrSectOffsetAddr	= 0;
 	UINT  uiSectBoundary		= 0;
-	UINT  uiNumSectTobeRead 	= 0;
-	UCHAR ucReadBk[16]       	= {0};
+	UINT  uiNumSectTobeRead	= 0;
+	UCHAR ucReadBk[16]	= {0};
 	ULONG ulStatus              = 0;
-	INT Status 					= STATUS_SUCCESS;
-	UINT uiTemp 				= 0;
-	UINT index 					= 0;
-	UINT uiPartOffset 			= 0;
+	INT Status					= STATUS_SUCCESS;
+	UINT uiTemp				= 0;
+	UINT index					= 0;
+	UINT uiPartOffset			= 0;
 
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
 	Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
 	return Status;
 #endif
 
-	uiOffsetFromSectStart 	= uiOffset & ~(Adapter->uiSectorSize - 1);
+	uiOffsetFromSectStart	= uiOffset & ~(Adapter->uiSectorSize - 1);
 
 	//Adding flash Base address
 //	uiOffset = uiOffset + GetFlashBaseAddr(Adapter);
 
-	uiSectAlignAddr   		= uiOffset & ~(Adapter->uiSectorSize - 1);
+	uiSectAlignAddr		= uiOffset & ~(Adapter->uiSectorSize - 1);
 	uiCurrSectOffsetAddr	= uiOffset & (Adapter->uiSectorSize - 1);
-	uiSectBoundary	  		= uiSectAlignAddr + Adapter->uiSectorSize;
+	uiSectBoundary			= uiSectAlignAddr + Adapter->uiSectorSize;
 
 	pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
 	if(NULL == pTempBuff)
@@ -1382,7 +1382,7 @@ BeceemFlashBulkWrite_EXIT:
 //
 // Arguments:
 //		Adapter    - ptr to Adapter object instance
-//		pBuffer 	- Data to be written.
+//		pBuffer	- Data to be written.
 //		uiOffset   - Offset of the flash where data needs to be written to.
 //		uiNumBytes - Number of bytes to be written.
 //		bVerify    - read verify flag.
@@ -1398,28 +1398,28 @@ static INT BeceemFlashBulkWriteStatus(
 	UINT uiNumBytes,
 	BOOLEAN bVerify)
 {
-	PCHAR  pTempBuff 			= NULL;
+	PCHAR  pTempBuff			= NULL;
 	PUCHAR pcBuffer             = (PUCHAR)pBuffer;
 	UINT  uiIndex				= 0;
 	UINT  uiOffsetFromSectStart = 0;
 	UINT  uiSectAlignAddr		= 0;
 	UINT  uiCurrSectOffsetAddr	= 0;
 	UINT  uiSectBoundary		= 0;
-	UINT  uiNumSectTobeRead 	= 0;
+	UINT  uiNumSectTobeRead	= 0;
 	UCHAR ucReadBk[16]			= {0};
 	ULONG ulStatus              = 0;
 	UINT  Status				= STATUS_SUCCESS;
-	UINT uiTemp 				= 0;
-	UINT index 					= 0;
+	UINT uiTemp				= 0;
+	UINT index					= 0;
 	UINT uiPartOffset			= 0;
 
-	uiOffsetFromSectStart 	= uiOffset & ~(Adapter->uiSectorSize - 1);
+	uiOffsetFromSectStart	= uiOffset & ~(Adapter->uiSectorSize - 1);
 
 	//uiOffset += Adapter->ulFlashCalStart;
 	//Adding flash Base address
 //	uiOffset = uiOffset + GetFlashBaseAddr(Adapter);
 
-	uiSectAlignAddr 		= uiOffset & ~(Adapter->uiSectorSize - 1);
+	uiSectAlignAddr		= uiOffset & ~(Adapter->uiSectorSize - 1);
 	uiCurrSectOffsetAddr	= uiOffset & (Adapter->uiSectorSize - 1);
 	uiSectBoundary			= uiSectAlignAddr + Adapter->uiSectorSize;
 
@@ -1718,7 +1718,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
 //
 // Arguments:
 //		Adapter       - ptr to Adapter object instance
-//		pBuffer 	    - Data to be written.
+//		pBuffer	    - Data to be written.
 //		uiOffset       - Offset of the flash where data needs to be written to.
 //		uiNumBytes - Number of bytes to be written.
 // Returns:
@@ -1732,9 +1732,9 @@ static INT BeceemEEPROMReadBackandVerify(
 	UINT uiOffset,
 	UINT uiNumBytes)
 {
-	UINT uiRdbk  	= 0;
-	UINT uiIndex 	= 0;
-	UINT uiData  	= 0;
+	UINT uiRdbk	= 0;
+	UINT uiIndex	= 0;
+	UINT uiData	= 0;
 	UINT auiData[4] = {0};
 
 	while(uiNumBytes)
@@ -1820,7 +1820,7 @@ static VOID BcmSwapWord(UINT *ptr1) {
 //
 // Arguments:
 //		Adapter       - ptr to Adapter object instance
-//		uiData 	  	  - Data to be written.
+//		uiData		  - Data to be written.
 //		uiOffset      - Offset of the EEPROM where data needs to be written to.
 // Returns:
 //		OSAL_STATUS_CODE
@@ -1959,7 +1959,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
 //
 // Arguments:
 //		Adapter       - ptr to Adapter object instance
-//		pBuffer 	    - Data to be written.
+//		pBuffer	    - Data to be written.
 //		uiOffset       - Offset of the EEPROM where data needs to be written to.
 //		uiNumBytes - Number of bytes to be written.
 //		bVerify        - read verify flag.
@@ -1976,12 +1976,12 @@ INT BeceemEEPROMBulkWrite(
 	BOOLEAN bVerify)
 {
 	UINT  uiBytesToCopy = uiNumBytes;
-	//UINT  uiRdbk 		= 0;
-	UINT  uiData[4] 	= {0};
-	UINT  uiIndex 		= 0;
+	//UINT  uiRdbk		= 0;
+	UINT  uiData[4]	= {0};
+	UINT  uiIndex		= 0;
 	UINT  uiTempOffset  = 0;
 	UINT  uiExtraBytes  = 0;
-	//PUINT puiBuffer 	= (PUINT)pBuffer;
+	//PUINT puiBuffer	= (PUINT)pBuffer;
 	//INT value;
 
 	if(uiOffset%MAX_RW_SIZE && uiBytesToCopy)
@@ -2805,13 +2805,13 @@ static INT	ConvertEndianOf2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo)
 static INT	ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
 {
 	//UINT Index = 0;
-	psFlashCSInfo->MagicNumber					 		=ntohl(psFlashCSInfo->MagicNumber);
+	psFlashCSInfo->MagicNumber							=ntohl(psFlashCSInfo->MagicNumber);
 	psFlashCSInfo->FlashLayoutVersion					=ntohl(psFlashCSInfo->FlashLayoutVersion);
-	psFlashCSInfo->ISOImageVersion 						= ntohl(psFlashCSInfo->ISOImageVersion);
+	psFlashCSInfo->ISOImageVersion						= ntohl(psFlashCSInfo->ISOImageVersion);
 	//won't convert according to old assumption
 	psFlashCSInfo->SCSIFirmwareVersion =(psFlashCSInfo->SCSIFirmwareVersion);
 
-	psFlashCSInfo->OffsetFromZeroForPart1ISOImage  		= ntohl(psFlashCSInfo->OffsetFromZeroForPart1ISOImage);
+	psFlashCSInfo->OffsetFromZeroForPart1ISOImage		= ntohl(psFlashCSInfo->OffsetFromZeroForPart1ISOImage);
 	psFlashCSInfo->OffsetFromZeroForScsiFirmware        = ntohl(psFlashCSInfo->OffsetFromZeroForScsiFirmware);
 	psFlashCSInfo->SizeOfScsiFirmware                   = ntohl(psFlashCSInfo->SizeOfScsiFirmware );
 	psFlashCSInfo->OffsetFromZeroForPart2ISOImage       = ntohl(psFlashCSInfo->OffsetFromZeroForPart2ISOImage);
@@ -2821,23 +2821,23 @@ static INT	ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
 	psFlashCSInfo->OffsetFromZeroForVSAEnd              = ntohl(psFlashCSInfo->OffsetFromZeroForVSAEnd);
 	psFlashCSInfo->OffsetFromZeroForControlSectionStart = ntohl(psFlashCSInfo->OffsetFromZeroForControlSectionStart);
 	psFlashCSInfo->OffsetFromZeroForControlSectionData  = ntohl(psFlashCSInfo->OffsetFromZeroForControlSectionData);
-	psFlashCSInfo->CDLessInactivityTimeout 				= ntohl(psFlashCSInfo->CDLessInactivityTimeout);
+	psFlashCSInfo->CDLessInactivityTimeout				= ntohl(psFlashCSInfo->CDLessInactivityTimeout);
 	psFlashCSInfo->NewImageSignature                    = ntohl(psFlashCSInfo->NewImageSignature);
 	psFlashCSInfo->FlashSectorSizeSig                   = ntohl(psFlashCSInfo->FlashSectorSizeSig);
 	psFlashCSInfo->FlashSectorSize                      = ntohl(psFlashCSInfo->FlashSectorSize);
 	psFlashCSInfo->FlashWriteSupportSize                = ntohl(psFlashCSInfo->FlashWriteSupportSize);
-	psFlashCSInfo->TotalFlashSize        				= ntohl(psFlashCSInfo->TotalFlashSize);
- 	psFlashCSInfo->FlashBaseAddr         				= ntohl(psFlashCSInfo->FlashBaseAddr);
-	psFlashCSInfo->FlashPartMaxSize      				= ntohl(psFlashCSInfo->FlashPartMaxSize);
- 	psFlashCSInfo->IsCDLessDeviceBootSig 				= ntohl(psFlashCSInfo->IsCDLessDeviceBootSig);
-	psFlashCSInfo->MassStorageTimeout    				= ntohl(psFlashCSInfo->MassStorageTimeout);
+	psFlashCSInfo->TotalFlashSize				= ntohl(psFlashCSInfo->TotalFlashSize);
+	psFlashCSInfo->FlashBaseAddr				= ntohl(psFlashCSInfo->FlashBaseAddr);
+	psFlashCSInfo->FlashPartMaxSize				= ntohl(psFlashCSInfo->FlashPartMaxSize);
+	psFlashCSInfo->IsCDLessDeviceBootSig				= ntohl(psFlashCSInfo->IsCDLessDeviceBootSig);
+	psFlashCSInfo->MassStorageTimeout				= ntohl(psFlashCSInfo->MassStorageTimeout);
 
 	return STATUS_SUCCESS;
 }
 
 static INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
 {
- 	return ( Adapter->uiVendorExtnFlag &&
+	return ( Adapter->uiVendorExtnFlag &&
 		 (Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) &&
 		 (Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS) );
 }
@@ -3002,14 +3002,14 @@ static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 		   (BYTE_WRITE_SUPPORT == (Adapter->psFlashCSInfo->FlashWriteSupportSize)))
 		{
 			Adapter->ulFlashWriteSize = (Adapter->psFlashCSInfo->FlashWriteSupportSize);
-		   	Adapter->fpFlashWrite = flashByteWrite;
-		   	Adapter->fpFlashWriteWithStatusCheck = flashByteWriteStatus;
+			Adapter->fpFlashWrite = flashByteWrite;
+			Adapter->fpFlashWriteWithStatusCheck = flashByteWriteStatus;
 		}
 		else
 		{
 			Adapter->ulFlashWriteSize = MAX_RW_SIZE;
 			Adapter->fpFlashWrite = flashWrite;
-		   	Adapter->fpFlashWriteWithStatusCheck = flashWriteStatus;
+			Adapter->fpFlashWriteWithStatusCheck = flashWriteStatus;
 		}
 
 		BcmGetFlashSectorSize(Adapter, (Adapter->psFlashCSInfo->FlashSectorSizeSig),
@@ -3036,14 +3036,14 @@ static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 		   (BYTE_WRITE_SUPPORT == Adapter->psFlash2xCSInfo->FlashWriteSupportSize))
 		{
 			Adapter->ulFlashWriteSize = Adapter->psFlash2xCSInfo->FlashWriteSupportSize;
-		   	Adapter->fpFlashWrite = flashByteWrite;
-		   	Adapter->fpFlashWriteWithStatusCheck = flashByteWriteStatus;
+			Adapter->fpFlashWrite = flashByteWrite;
+			Adapter->fpFlashWriteWithStatusCheck = flashByteWriteStatus;
 		}
 		else
 		{
 			Adapter->ulFlashWriteSize = MAX_RW_SIZE;
 			Adapter->fpFlashWrite = flashWrite;
-		   	Adapter->fpFlashWriteWithStatusCheck = flashWriteStatus;
+			Adapter->fpFlashWriteWithStatusCheck = flashWriteStatus;
 		}
 
 		BcmGetFlashSectorSize(Adapter, Adapter->psFlash2xCSInfo->FlashSectorSizeSig,
@@ -3389,7 +3389,7 @@ INT BcmFlash2xBulkWrite(
 	UINT bVerify)
 {
 
-	INT Status 	= STATUS_SUCCESS;
+	INT Status	= STATUS_SUCCESS;
 	UINT FlashSectValStartOffset = 0;
 	UINT uiTemp = 0, value = 0;
 	if(Adapter == NULL)
@@ -3544,7 +3544,7 @@ B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset)
 	permissionBits = uiWordOfSectorPermission & (0x3 << uiBitofSectorePermission) ;
 	permissionBits = (permissionBits >> uiBitofSectorePermission) & 0x3;
 	if(permissionBits == SECTOR_READWRITE_PERMISSION)
-		return 	TRUE;
+		return	TRUE;
 	else
 		return FALSE;
 }
@@ -3762,7 +3762,7 @@ INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2
 	}
 
 	///
-	// 	VSA 0
+	//	VSA 0
 	///
 	if((psFlash2xCSInfo->OffsetFromZeroForVSAStart) != UNINIT_PTR_IN_CS)
 	{
@@ -4911,7 +4911,7 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
 	*/
 
 	if(Adapter->SelectedChip == ChipNum)
-    		return STATUS_SUCCESS;
+		return STATUS_SUCCESS;
 
 	//bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Selected Chip :%x\n", ChipNum);
 	Adapter->SelectedChip = ChipNum ;
@@ -5028,7 +5028,7 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
 		DsdPri = ReadDSDPriority(Adapter,DSD1);
 		if(DSDHighestPri  < DsdPri)
 		{
-		 	DSDHighestPri = DsdPri ;
+			DSDHighestPri = DsdPri ;
 			HighestPriDSD = DSD1;
 		}
 	}
@@ -5037,7 +5037,7 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
 		DsdPri = ReadDSDPriority(Adapter,DSD0);
 		if(DSDHighestPri  < DsdPri)
 		{
-		 	DSDHighestPri = DsdPri ;
+			DSDHighestPri = DsdPri ;
 			HighestPriDSD = DSD0;
 		}
 	}
diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h
index afdd76a..148488e 100644
--- a/drivers/staging/bcm/nvm.h
+++ b/drivers/staging/bcm/nvm.h
@@ -10,7 +10,7 @@
 //
 //
 // Revision History:
-//	 Who 		When		What
+//	 Who		When		What
 //	 --------	--------	----------------------------------------------
 //	 Name		Date		Created/reviewed/modified
 //
@@ -147,7 +147,7 @@ typedef struct _FLASH_2X_CS_INFO
 
 	B_UINT32 FlashSectorSizeSig;			// Sector Size Signature
 	B_UINT32 FlashSectorSize;			// Sector Size
-	B_UINT32 FlashWriteSupportSize; 	// Write Size Support
+	B_UINT32 FlashWriteSupportSize;	// Write Size Support
 
 	B_UINT32 TotalFlashSize;			// Total Flash Size
 
@@ -162,18 +162,18 @@ typedef struct _FLASH_2X_CS_INFO
 	B_UINT32 MassStorageTimeout;
 
 	/* Flash Map 2.0 Field */
-	B_UINT32 OffsetISOImage1Part1Start; 	// ISO Image1 Part1 offset
+	B_UINT32 OffsetISOImage1Part1Start;	// ISO Image1 Part1 offset
 	B_UINT32 OffsetISOImage1Part1End;
-	B_UINT32 OffsetISOImage1Part2Start; 	// ISO Image1 Part2 offset
+	B_UINT32 OffsetISOImage1Part2Start;	// ISO Image1 Part2 offset
 	B_UINT32 OffsetISOImage1Part2End;
-	B_UINT32 OffsetISOImage1Part3Start; 	// ISO Image1 Part3 offset
+	B_UINT32 OffsetISOImage1Part3Start;	// ISO Image1 Part3 offset
 	B_UINT32 OffsetISOImage1Part3End;
 
-	B_UINT32 OffsetISOImage2Part1Start; 	// ISO Image2 Part1 offset
+	B_UINT32 OffsetISOImage2Part1Start;	// ISO Image2 Part1 offset
 	B_UINT32 OffsetISOImage2Part1End;
-	B_UINT32 OffsetISOImage2Part2Start; 	// ISO Image2 Part2 offset
+	B_UINT32 OffsetISOImage2Part2Start;	// ISO Image2 Part2 offset
 	B_UINT32 OffsetISOImage2Part2End;
-	B_UINT32 OffsetISOImage2Part3Start; 	// ISO Image2 Part3 offset
+	B_UINT32 OffsetISOImage2Part3Start;	// ISO Image2 Part3 offset
 	B_UINT32 OffsetISOImage2Part3End;
 
 
@@ -270,7 +270,7 @@ typedef struct _ISO_HEADER
 #define EEPROM_CMDQ_SPI_REG                      0x0F003018
 #define EEPROM_WRITE_DATAQ_REG					 0x0F00301C
 #define EEPROM_READ_DATAQ_REG					 0x0F003020
-#define SPI_FLUSH_REG 							 0x0F00304C
+#define SPI_FLUSH_REG							 0x0F00304C
 
 #define EEPROM_WRITE_ENABLE						 0x06000000
 #define EEPROM_READ_STATUS_REGISTER				 0x05000000
@@ -288,11 +288,11 @@ typedef struct _ISO_HEADER
 #define EEPROM_ALL_QUEUE_FLUSH					 0x0000000f
 #define EEPROM_READ_ENABLE						 0x06000000
 #define EEPROM_16_BYTE_PAGE_WRITE				 0xFA000000
-#define EEPROM_READ_DATA_FULL				 	 0x00000010
-#define EEPROM_READ_DATA_AVAIL				 	 0x00000020
-#define EEPROM_READ_QUEUE_EMPTY				 	 0x00000002
-#define EEPROM_CMD_QUEUE_EMPTY				 	 0x00000100
-#define EEPROM_CMD_QUEUE_AVAIL				 	 0x00000200
+#define EEPROM_READ_DATA_FULL					 0x00000010
+#define EEPROM_READ_DATA_AVAIL					 0x00000020
+#define EEPROM_READ_QUEUE_EMPTY					 0x00000002
+#define EEPROM_CMD_QUEUE_EMPTY					 0x00000100
+#define EEPROM_CMD_QUEUE_AVAIL					 0x00000200
 #define EEPROM_CMD_QUEUE_FULL					 0x00000400
 
 /* Most EEPROM status register bit 0 indicates if the EEPROM is busy
diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index da4d0f0..dcf02ff 100644
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -53,11 +53,11 @@ INT vendorextnExit(PMINI_ADAPTER Adapter)
 //------------------------------------------------------------------------
 // Procedure:	vendorextnIoctl
 //
-// Description: 	execute the vendor extension specific ioctl
+// Description:	execute the vendor extension specific ioctl
 //
 //Arguments:
 //		Adapter -Beceem private Adapter Structure
-//		cmd 	-vendor extension specific Ioctl commad
+//		cmd	-vendor extension specific Ioctl commad
 //		arg		-input parameter sent by vendor
 //
 // Returns:
-- 
1.7.8.111.gad25c.dirty




More information about the devel mailing list