Commit e6e5ec30 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8188ee: rtl8192ce: rtl8192de: rtl8723ae: rtl8821ae: Remove some... 


rtlwifi: rtl8188ee: rtl8192ce: rtl8192de: rtl8723ae: rtl8821ae: Remove some unused bit manipulation macros

Each of these drivers defines some device to host macros that are never
used, thus they can be removed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent fca13fd0

drivers/net/wireless/realtek/rtlwifi/base.h

+0 −27
Original line number Diff line number Diff line
@@ -46,15 +46,6 @@ enum ap_peer { 
#define MAX_LISTEN_INTERVAL		10

#define MAX_RATE_TRIES			4



#define SET_80211_HDR_FRAME_CONTROL(_hdr, _val)		\

	WRITEEF2BYTE(_hdr, _val)

#define SET_80211_HDR_TYPE_AND_SUBTYPE(_hdr, _val)	\

	WRITEEF1BYTE(_hdr, _val)

#define SET_80211_HDR_PWR_MGNT(_hdr, _val)		\

	SET_BITS_TO_LE_2BYTE(_hdr, 12, 1, _val)

#define SET_80211_HDR_TO_DS(_hdr, _val)			\

	SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val)



#define SET_80211_PS_POLL_AID(_hdr, _val)		\

	(*(u16 *)((u8 *)(_hdr) + 2) = _val)

#define SET_80211_PS_POLL_BSSID(_hdr, _val)		\
@@ -62,30 +53,12 @@ enum ap_peer { 
#define SET_80211_PS_POLL_TA(_hdr, _val)		\

	ether_addr_copy(((u8 *)(_hdr))+10, (u8 *)(_val))



#define SET_80211_HDR_DURATION(_hdr, _val)	\

	(*(u16 *)((u8 *)(_hdr) + FRAME_OFFSET_DURATION) = le16_to_cpu(_val))

#define SET_80211_HDR_ADDRESS1(_hdr, _val)	\

	CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS1, (u8 *)(_val))

#define SET_80211_HDR_ADDRESS2(_hdr, _val)	\

	CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS2, (u8 *)(_val))

#define SET_80211_HDR_ADDRESS3(_hdr, _val)	\

	CP_MACADDR((u8 *)(_hdr)+FRAME_OFFSET_ADDRESS3, (u8 *)(_val))

#define SET_80211_HDR_FRAGMENT_SEQUENCE(_hdr, _val)  \

	WRITEEF2BYTE((u8 *)(_hdr)+FRAME_OFFSET_SEQUENCE, _val)



#define SET_BEACON_PROBE_RSP_TIME_STAMP_LOW(__phdr, __val)	\

	WRITEEF4BYTE(((u8 *)(__phdr)) + 24, __val)

#define SET_BEACON_PROBE_RSP_TIME_STAMP_HIGH(__phdr, __val) \

	WRITEEF4BYTE(((u8 *)(__phdr)) + 28, __val)

#define SET_BEACON_PROBE_RSP_BEACON_INTERVAL(__phdr, __val) \

	WRITEEF2BYTE(((u8 *)(__phdr)) + 32, __val)

#define GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr)		\

	READEF2BYTE(((u8 *)(__phdr)) + 34)

#define SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, __val) \

	WRITEEF2BYTE(((u8 *)(__phdr)) + 34, __val)

#define MASK_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, __val) \

	SET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr, \

	(GET_BEACON_PROBE_RSP_CAPABILITY_INFO(__phdr) & (~(__val))))



#define SET_TX_DESC_SPE_RPT(__pdesc, __val)			\

	SET_BITS_TO_LE_4BYTE((__pdesc) + 8, 19, 1, __val)

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h

+0 −29
Original line number Diff line number Diff line
@@ -12,35 +12,6 @@ 
#define RX_CMD_QUEUE					1



#define	C2H_RX_CMD_HDR_LEN				8

#define	GET_C2H_CMD_CMD_LEN(__prxhdr)			\

	LE_BITS_TO_4BYTE((__prxhdr), 0, 16)

#define	GET_C2H_CMD_ELEMENT_ID(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 16, 8)

#define	GET_C2H_CMD_CMD_SEQ(__prxhdr)			\

	LE_BITS_TO_4BYTE((__prxhdr), 24, 7)

#define	GET_C2H_CMD_CONTINUE(__prxhdr)			\

	LE_BITS_TO_4BYTE((__prxhdr), 31, 1)

#define	GET_C2H_CMD_CONTENT(__prxhdr)			\

	((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)



#define	GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)

#define	GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)

#define	GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)



#define CHIP_BONDING_IDENTIFIER(_value)	(((_value)>>22)&0x3)

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h

+0 −33
Original line number Diff line number Diff line
@@ -17,39 +17,6 @@ 
#define RX_MPDU_QUEUE					0

#define RX_CMD_QUEUE					1



#define	C2H_RX_CMD_HDR_LEN				8

#define	GET_C2H_CMD_CMD_LEN(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 0, 16)

#define	GET_C2H_CMD_ELEMENT_ID(__prxhdr)	\

	LE_BITS_TO_4BYTE((__prxhdr), 16, 8)

#define	GET_C2H_CMD_CMD_SEQ(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 24, 7)

#define	GET_C2H_CMD_CONTINUE(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 31, 1)

#define	GET_C2H_CMD_CONTENT(__prxhdr)		\

	((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)



#define	GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)

#define	GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)

#define	GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)

#define GET_RX_STATUS_DESC_BUFF_ADDR(__pdesc)			\

	SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32)



#define CHIP_VER_B			BIT(4)

#define CHIP_BONDING_IDENTIFIER(_value) (((_value) >> 22) & 0x3)

#define CHIP_BONDING_92C_1T2R		0x1

drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h

+0 −31
Original line number Diff line number Diff line
@@ -26,37 +26,6 @@ 
#define RX_MPDU_QUEUE					0

#define RX_CMD_QUEUE					1



#define	C2H_RX_CMD_HDR_LEN				8

#define	GET_C2H_CMD_CMD_LEN(__prxhdr)			\

	LE_BITS_TO_4BYTE((__prxhdr), 0, 16)

#define	GET_C2H_CMD_ELEMENT_ID(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 16, 8)

#define	GET_C2H_CMD_CMD_SEQ(__prxhdr)			\

	LE_BITS_TO_4BYTE((__prxhdr), 24, 7)

#define	GET_C2H_CMD_CONTINUE(__prxhdr)			\

	LE_BITS_TO_4BYTE((__prxhdr), 31, 1)

#define	GET_C2H_CMD_CONTENT(__prxhdr)			\

	((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)



#define	GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)

#define	GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)

#define	GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)



enum version_8192d {

	VERSION_TEST_CHIP_88C = 0x0000,

	VERSION_TEST_CHIP_92C = 0x0020,

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h

+0 −31
Original line number Diff line number Diff line
@@ -11,37 +11,6 @@ 
#define RX_MPDU_QUEUE						0

#define RX_CMD_QUEUE						1



#define	C2H_RX_CMD_HDR_LEN					8

#define	GET_C2H_CMD_CMD_LEN(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 0, 16)

#define	GET_C2H_CMD_ELEMENT_ID(__prxhdr)	\

	LE_BITS_TO_4BYTE((__prxhdr), 16, 8)

#define	GET_C2H_CMD_CMD_SEQ(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 24, 7)

#define	GET_C2H_CMD_CONTINUE(__prxhdr)		\

	LE_BITS_TO_4BYTE((__prxhdr), 31, 1)

#define	GET_C2H_CMD_CONTENT(__prxhdr)		\

	((u8 *)(__prxhdr) + C2H_RX_CMD_HDR_LEN)



#define	GET_C2H_CMD_FEEDBACK_ELEMENT_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 0, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_LEN(__pcmdfbhdr)		\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 8, 8)

#define	GET_C2H_CMD_FEEDBACK_CCX_CMD_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE((__pcmdfbhdr), 16, 16)

#define	GET_C2H_CMD_FEEDBACK_CCX_MAC_ID(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 0, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_VALID(__pcmdfbhdr)		\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 7, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_RETRY_CNT(__pcmdfbhdr)	\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 8, 5)

#define	GET_C2H_CMD_FEEDBACK_CCX_TOK(__pcmdfbhdr)		\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 15, 1)

#define	GET_C2H_CMD_FEEDBACK_CCX_QSEL(__pcmdfbhdr)		\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4)

#define	GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)		\

	LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)



#define CHIP_BONDING_IDENTIFIER(_value)	(((_value)>>22)&0x3)

#define	CHIP_BONDING_92C_1T2R		0x1

CRA Git | Maintained and supported by SUSTech CRA and CCSE