Skip to contentSkip to conversation

Staging: rtl8188eu: Cleanups involving removing unused externs and macros

PATCH New Vatika Harlalka 1 participant 4 messages Mar 19, 2015 Staging

lore
Share & tools
lore
#0 lore raw

cover Staging: rtl8188eu: Cleanups involving removing unused externs and macros

This patchset is for cleanups involving removing unused macros and externs

Vatika Harlalka (3):
Staging: rtl8188eu: Remove unused extern declarations.
Staging: rtl8188eu: Remove unused macros
Staging: rtl8188eu: Remove extern as it is defined but never used

 drivers/staging/rtl8188eu/core/rtw_ieee80211.c   |  1 -
 drivers/staging/rtl8188eu/include/ieee80211.h    |  1 -
 drivers/staging/rtl8188eu/include/rtw_security.h | 26 ------------------------
 3 files changed, 28 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/3 Staging: rtl8188eu: Remove unused extern declarations.

These externs are defined but not used anywhere in the code.

---
 drivers/staging/rtl8188eu/include/rtw_security.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/rtl8188eu/include/rtw_security.h +0 -4
index 66d60aa..a00d1e6 100644
@@ -245,10 +245,6 @@ struct mic_data {
 };
 
 extern const u32 Te0[256];
-extern const u32 Te1[256];
-extern const u32 Te2[256];
-extern const u32 Te3[256];
-extern const u32 Te4[256];
 extern const u32 Td0[256];
 extern const u32 Td1[256];
 extern const u32 Td2[256];
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/3 Staging: rtl8188eu: Remove unused macros

In reply to Vatika Harlalka

These macros are defined but never used in the code.

---
 drivers/staging/rtl8188eu/include/rtw_security.h | 22 ----------------------
 1 file changed, 22 deletions(-)
drivers/staging/rtl8188eu/include/rtw_security.h +0 -22
index a00d1e6..e9723a7 100644
@@ -265,28 +265,6 @@ static inline u32 rotr(u32 val, int bits)
 #define TE1(i) rotr(Te0[((i) >> 16) & 0xff], 8)
 #define TE2(i) rotr(Te0[((i) >> 8) & 0xff], 16)
 #define TE3(i) rotr(Te0[(i) & 0xff], 24)
-#define TE41(i) ((Te0[((i) >> 24) & 0xff] << 8) & 0xff000000)
-#define TE42(i) (Te0[((i) >> 16) & 0xff] & 0x00ff0000)
-#define TE43(i) (Te0[((i) >> 8) & 0xff] & 0x0000ff00)
-#define TE44(i) ((Te0[(i) & 0xff] >> 8) & 0x000000ff)
-#define TE421(i) ((Te0[((i) >> 16) & 0xff] << 8) & 0xff000000)
-#define TE432(i) (Te0[((i) >> 8) & 0xff] & 0x00ff0000)
-#define TE443(i) (Te0[(i) & 0xff] & 0x0000ff00)
-#define TE414(i) ((Te0[((i) >> 24) & 0xff] >> 8) & 0x000000ff)
-#define TE4(i) ((Te0[(i)] >> 8) & 0x000000ff)
-
-#define TD0(i) Td0[((i) >> 24) & 0xff]
-#define TD1(i) rotr(Td0[((i) >> 16) & 0xff], 8)
-#define TD2(i) rotr(Td0[((i) >> 8) & 0xff], 16)
-#define TD3(i) rotr(Td0[(i) & 0xff], 24)
-#define TD41(i) (Td4s[((i) >> 24) & 0xff] << 24)
-#define TD42(i) (Td4s[((i) >> 16) & 0xff] << 16)
-#define TD43(i) (Td4s[((i) >> 8) & 0xff] << 8)
-#define TD44(i) (Td4s[(i) & 0xff])
-#define TD0_(i) Td0[(i) & 0xff]
-#define TD1_(i) rotr(Td0[(i) & 0xff], 8)
-#define TD2_(i) rotr(Td0[(i) & 0xff], 16)
-#define TD3_(i) rotr(Td0[(i) & 0xff], 24)
 
 #define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ \
 			((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/3 Staging: rtl8188eu: Remove extern as it is defined but never used

In reply to Vatika Harlalka

RTW_WPA_VERSION is removed as is declared and defined but never used in the code.

---
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 1 -
 drivers/staging/rtl8188eu/include/ieee80211.h  | 1 -
 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +0 -1
index f2c3ca7..767e23b 100644
@@ -27,7 +27,6 @@
 #include <wlan_bssdef.h>
 
 u8 RTW_WPA_OUI_TYPE[] = { 0x00, 0x50, 0xf2, 1 };
-u16 RTW_WPA_VERSION = 1;
 u8 WPA_AUTH_KEY_MGMT_NONE[] = { 0x00, 0x50, 0xf2, 0 };
 u8 WPA_AUTH_KEY_MGMT_UNSPEC_802_1X[] = { 0x00, 0x50, 0xf2, 1 };
 u8 WPA_AUTH_KEY_MGMT_PSK_OVER_802_1X[] = { 0x00, 0x50, 0xf2, 2 };
drivers/staging/rtl8188eu/include/ieee80211.h +0 -1
index 3299571..8fd35dc 100644
@@ -122,7 +122,6 @@ enum {
 
 #define WPA_SELECTOR_LEN 4
 extern u8 RTW_WPA_OUI_TYPE[];
-extern u16 RTW_WPA_VERSION;
 extern u8 WPA_AUTH_KEY_MGMT_NONE[];
 extern u8 WPA_AUTH_KEY_MGMT_UNSPEC_802_1X[];
 extern u8 WPA_AUTH_KEY_MGMT_PSK_OVER_802_1X[];
Signature · 1 line
1.9.1