Commit c07f9721 authored by Przemo Firszt's avatar Przemo Firszt Committed by Greg Kroah-Hartman
Browse files

rtl8712: code clean up 



Clean some trivial formating problems in rtl8712 from staging tree. This patch
also changes the way preprocessor macros are defined to keep checkpatch.pl
quiet.

Signed-off-by: default avatarPrzemo Firszt <przemo@firszt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 666b3bf2

drivers/staging/rtl8712/wifi.h

+73 −94
Original line number Diff line number Diff line
@@ -159,99 +159,85 @@ enum WIFI_REG_DOMAIN { 
#define _PRIVACY_	BIT(14)

#define _ORDER_		BIT(15)



#define SetToDs(pbuf)	\

	do	{	\

#define SetToDs(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_TO_DS_); \

	} while (0)

})



#define GetToDs(pbuf)	(((*(unsigned short *)(pbuf)) & \

			le16_to_cpu(_TO_DS_)) != 0)



#define ClearToDs(pbuf)	\

	do	{	\

#define ClearToDs(pbuf)	({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_TO_DS_)); \

	} while (0)

})



#define SetFrDs(pbuf)	\

	do	{	\

#define SetFrDs(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_FROM_DS_); \

	} while (0)

})



#define GetFrDs(pbuf)	(((*(unsigned short *)(pbuf)) & \

			le16_to_cpu(_FROM_DS_)) != 0)



#define ClearFrDs(pbuf)	\

	do	{	\

#define ClearFrDs(pbuf)	({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_FROM_DS_)); \

	} while (0)

})



#define get_tofr_ds(pframe)	((GetToDs(pframe) << 1) | GetFrDs(pframe))





#define SetMFrag(pbuf)	\

	do	{	\

#define SetMFrag(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_MORE_FRAG_); \

	} while (0)

})



#define GetMFrag(pbuf)	(((*(unsigned short *)(pbuf)) & \

			le16_to_cpu(_MORE_FRAG_)) != 0)



#define ClearMFrag(pbuf)	\

	do	{	\

#define ClearMFrag(pbuf) ({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_)); \

	} while (0)

})



#define SetRetry(pbuf)	\

	do	{	\

#define SetRetry(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_RETRY_); \

	} while (0)

})



#define GetRetry(pbuf)	(((*(unsigned short *)(pbuf)) & \

			le16_to_cpu(_RETRY_)) != 0)



#define ClearRetry(pbuf)	\

	do	{	\

#define ClearRetry(pbuf) ({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_RETRY_)); \

	} while (0)

})



#define SetPwrMgt(pbuf)	\

	do	{	\

#define SetPwrMgt(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_PWRMGT_); \

	} while (0)

})



#define GetPwrMgt(pbuf)	(((*(unsigned short *)(pbuf)) & \

			le16_to_cpu(_PWRMGT_)) != 0)



#define ClearPwrMgt(pbuf)	\

	do	{	\

#define ClearPwrMgt(pbuf) ({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_PWRMGT_)); \

	} while (0)

})



#define SetMData(pbuf)	\

	do	{	\

#define SetMData(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_MORE_DATA_); \

	} while (0)

})



#define GetMData(pbuf)	(((*(unsigned short *)(pbuf)) & \

			le16_to_cpu(_MORE_DATA_)) != 0)



#define ClearMData(pbuf)	\

	do	{	\

#define ClearMData(pbuf) ({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_)); \

	} while (0)

})



#define SetPrivacy(pbuf)	\

	do	{	\

#define SetPrivacy(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_PRIVACY_); \

	} while (0)

})



#define GetPrivacy(pbuf)	(((*(unsigned short *)(pbuf)) & \

				le16_to_cpu(_PRIVACY_)) != 0)



#define ClearPrivacy(pbuf)	\

	do	{	\

#define ClearPrivacy(pbuf) ({ \

	*(unsigned short *)(pbuf) &= (~cpu_to_le16(_PRIVACY_)); \

	} while (0)

})





#define GetOrder(pbuf)	(((*(unsigned short *)(pbuf)) & \
@@ -287,48 +273,42 @@ enum WIFI_REG_DOMAIN { 
#define GetTupleCache(pbuf)	(cpu_to_le16(*(unsigned short *)\

				((addr_t)(pbuf) + 22)))



#define SetFragNum(pbuf, num) \

	do {    \

#define SetFragNum(pbuf, num) ({ \

	*(unsigned short *)((addr_t)(pbuf) + 22) = \

	((*(unsigned short *)((addr_t)(pbuf) + 22)) & \

	le16_to_cpu(~(0x000f))) | \

	cpu_to_le16(0x0f & (num));     \

	} while (0)

})



#define SetSeqNum(pbuf, num) \

	do {    \

#define SetSeqNum(pbuf, num) ({ \

	*(unsigned short *)((addr_t)(pbuf) + 22) = \

	((*(unsigned short *)((addr_t)(pbuf) + 22)) & \

	le16_to_cpu((unsigned short)0x000f)) | \

	le16_to_cpu((unsigned short)(0xfff0 & (num << 4))); \

	} while (0)

})



#define SetDuration(pbuf, dur) \

	do {    \

#define SetDuration(pbuf, dur) ({ \

	*(unsigned short *)((addr_t)(pbuf) + 2) |= \

	cpu_to_le16(0xffff & (dur)); \

	} while (0)

})



#define SetPriority(pbuf, tid)	\

	do	{	\

#define SetPriority(pbuf, tid) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(tid & 0xf); \

	} while (0)

})



#define GetPriority(pbuf)	((le16_to_cpu(*(unsigned short *)(pbuf))) & 0xf)



#define SetAckpolicy(pbuf, ack)	\

	do	{	\

#define SetAckpolicy(pbuf, ack) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16((ack & 3) << 5); \

	} while (0)

})



#define GetAckpolicy(pbuf) (((le16_to_cpu(*(unsigned short *)pbuf)) >> 5) & 0x3)



#define GetAMsdu(pbuf) (((le16_to_cpu(*(unsigned short *)pbuf)) >> 7) & 0x1)



#define SetAMsdu(pbuf, amsdu)	\

	do	{	\

#define SetAMsdu(pbuf, amsdu) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7); \

	} while (0)

})



#define GetAid(pbuf)	(cpu_to_le16(*(unsigned short *)((addr_t)(pbuf) + 2)) \

			& 0x3fff)
@@ -526,10 +506,9 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) 
#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000

#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800



#define SetOrderBit(pbuf)	\

	do	{	\

#define SetOrderBit(pbuf) ({ \

	*(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \

	} while (0)

})



#define GetOrderBit(pbuf)	(((*(unsigned short *)(pbuf)) & \

				le16_to_cpu(_ORDER_)) != 0)

drivers/staging/rtl8712/ieee80211.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/rtl8712/rtl871x_cmd.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/rtl8712/rtl871x_security.h

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/rtl8712/sta_info.h

+1 −1

File changed.

Contains only whitespace changes.