Skip to contentSkip to conversation

staging: r8188eu: remove unused macros from wifi.h

PATCH In review Michael Straube 2 participants 2 messages Oct 25, 2022 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

PATCH 1/1 staging: r8188eu: remove unused macros from wifi.h

There are some unused macros in wifi.h. Remove them.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/include/wifi.h | 27 --------------------------
 1 file changed, 27 deletions(-)
drivers/staging/r8188eu/include/wifi.h +0 -27
index 381385a7e118..05f8b7e3ecb0 100644
@@ -140,7 +140,6 @@ enum WIFI_REG_DOMAIN {
 #define _PWRMGT_	BIT(12)
 #define _MORE_DATA_	BIT(13)
 #define _PRIVACY_	BIT(14)
-#define _ORDER_		BIT(15)
 
 #define SetToDs(pbuf)	\
 	*(__le16 *)(pbuf) |= cpu_to_le16(_TO_DS_)

@@ -187,17 +186,6 @@ enum WIFI_REG_DOMAIN {
 		*(__le16 *)(pbuf) |= cpu_to_le16(type); \
 	} while (0)
 
-#define GetTupleCache(pbuf)			\
-	(cpu_to_le16(*(unsigned short *)((size_t)(pbuf) + 22)))
-
-#define SetFragNum(pbuf, num) \
-	do {    \
-		*(unsigned short *)((size_t)(pbuf) + 22) = \
-			((*(unsigned short *)((size_t)(pbuf) + 22)) &	\
-			le16_to_cpu(~(0x000f))) | \
-			cpu_to_le16(0x0f & (num));     \
-	} while (0)
-
 #define SetSeqNum(pbuf, num) \
 	do {    \
 		*(__le16 *)((size_t)(pbuf) + 22) = \

@@ -221,13 +209,6 @@ enum WIFI_REG_DOMAIN {
 
 #define GetAMsdu(pbuf) (((le16_to_cpu(*(__le16 *)pbuf)) >> 7) & 0x1)
 
-#define SetAMsdu(pbuf, amsdu)	\
-	*(__le16 *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)
-
-#define GetTid(pbuf)	(le16_to_cpu(*(__le16 *)((size_t)(pbuf) +	\
-			(((GetToDs(pbuf)<<1) | GetFrDs(pbuf)) == 3 ?	\
-			30 : 24))) & 0x000f)
-
 #define GetAddr1Ptr(pbuf)	((unsigned char *)((size_t)(pbuf) + 4))
 
 #define GetAddr2Ptr(pbuf)	((unsigned char *)((size_t)(pbuf) + 10))

@@ -415,14 +396,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
 				Below is the definition for 802.11n
 ------------------------------------------------------------------------------*/
 
-#define SetOrderBit(pbuf)	\
-	do	{	\
-		*(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \
-	} while (0)
-
-#define GetOrderBit(pbuf)			\
-	(((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0)
-
 /**
  * struct rtw_ieee80211_bar - HT Block Ack Request
  *
Signature · 1 line
2.38.0
Tested-by on v1 1/1
#1 lore raw
Quoted 56 lines · Michael Straube

There are some unused macros in wifi.h. Remove them.

Signed-off-by Michael Straube <[email protected]>
---
  drivers/staging/r8188eu/include/wifi.h | 27 --------------------------
  1 file changed, 27 deletions(-)
drivers/staging/r8188eu/include/wifi.h +0 -20
index 381385a7e118..05f8b7e3ecb0 100644
@@ -140,7 +140,6 @@ enum WIFI_REG_DOMAIN {
  #define _PWRMGT_	BIT(12)
  #define _MORE_DATA_	BIT(13)
  #define _PRIVACY_	BIT(14)
-#define _ORDER_		BIT(15)
 
  #define SetToDs(pbuf)	\
  	*(__le16 *)(pbuf) |= cpu_to_le16(_TO_DS_)

@@ -187,17 +186,6 @@ enum WIFI_REG_DOMAIN {
  		*(__le16 *)(pbuf) |= cpu_to_le16(type); \
  	} while (0)
 
-#define GetTupleCache(pbuf)			\
-	(cpu_to_le16(*(unsigned short *)((size_t)(pbuf) + 22)))
-
-#define SetFragNum(pbuf, num) \
-	do {    \
-		*(unsigned short *)((size_t)(pbuf) + 22) = \
-			((*(unsigned short *)((size_t)(pbuf) + 22)) &	\
-			le16_to_cpu(~(0x000f))) | \
-			cpu_to_le16(0x0f & (num));     \
-	} while (0)
-
  #define SetSeqNum(pbuf, num) \
  	do {    \
  		*(__le16 *)((size_t)(pbuf) + 22) = \

@@ -221,13 +209,6 @@ enum WIFI_REG_DOMAIN {
 
  #define GetAMsdu(pbuf) (((le16_to_cpu(*(__le16 *)pbuf)) >> 7) & 0x1)
 
-#define SetAMsdu(pbuf, amsdu)	\
-	*(__le16 *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)
-
-#define GetTid(pbuf)	(le16_to_cpu(*(__le16 *)((size_t)(pbuf) +	\
-			(((GetToDs(pbuf)<<1) | GetFrDs(pbuf)) == 3 ?	\
-			30 : 24))) & 0x000f)
-
  #define GetAddr1Ptr(pbuf)	((unsigned char *)((size_t)(pbuf) + 4))
 
  #define GetAddr2Ptr(pbuf)	((unsigned char *)((size_t)(pbuf) + 10))

@@ -415,14 +396,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
  				Below is the definition for 802.11n
  ------------------------------------------------------------------------------*/
 
-#define SetOrderBit(pbuf)	\

drivers/staging/r8188eu/include/wifi.h static inline unsigned char *get_hdr_bssid(unsigned char *pframe) · line 401

Quoted 10 lines
drivers/staging/r8188eu/include/wifi.h +0 -7
-	do	{	\
-		*(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \
-	} while (0)
-
-#define GetOrderBit(pbuf)			\
-	(((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0)
-
  /**
   * struct rtw_ieee80211_bar - HT Block Ack Request
   *
Tested-by Philipp Hortmann <[email protected]> # Edimax N150