[PATCH v2 1/2] staging: rtl8723bs: remove unused NDIS_802_11 typedefs

[PATCH v2 1/2] staging: rtl8723bs: remove unused NDIS_802_11 typedefs

[Malathi A]

The 'NDIS_802_11_RATES' and 'NDIS_802_11_PMKID_VALUE' types have no users
anywhere in the tree, only their typedef declarations remain. Remove both,
together with the 'NDIS_802_11_LENGTH_RATES' definition whose only user
was the 'NDIS_802_11_RATES' typedef.

This addresses part of the "convert any remaining unusual variable types"
entry in the driver TODO.

Signed-off-by: Malathi A <malathi.a2000@gmail.com>
---
v2:
 - Rebase onto staging-next. v1 was based on Linus' tree and did not
   apply, as staging-next already reworks wlan_bssdef.h.
 - Use my full name in From: and Signed-off-by:.
---
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 --
 drivers/staging/rtl8723bs/include/wlan_bssdef.h   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
index 768e4868ecfd..020b143f36be 100644
--- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
@@ -7,8 +7,6 @@
 #ifndef __RTW_IOCTL_SET_H_
 #define __RTW_IOCTL_SET_H_
 
-typedef u8 NDIS_802_11_PMKID_VALUE[16];
-
 u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode);
 u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep);
 u8 rtw_set_802_11_disassociate(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
index f4c1456f1476..ff2cee2f3b99 100644
--- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
@@ -12,10 +12,8 @@
 
 
 #define NDIS_802_11_LENGTH_SSID         32
-#define NDIS_802_11_LENGTH_RATES        8
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
-typedef unsigned char   NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES];        /*  Set of 8 data rates */
 typedef unsigned char   NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX];  /*  Set of 16 data rates */
 
 struct ndis_802_11_ssid {
-- 
2.43.0

[PATCH v2 2/2] staging: rtl8723bs: remove unusual 'NDIS_802_11_RATES_EX' type

[Malathi A]

Remove the 'NDIS_802_11_RATES_EX' type and replace the variables of this
type with an array of 'u8', which makes the code more understandable and
gets rid of an unnecessary 'typedef'.

'u8' and the 'unsigned char' the typedef expanded to are the same type and
the array length is unchanged, so there is no functional change. Also
update the comment in wlan_bssdef.h that referred to the removed type.

Signed-off-by: Malathi A <malathi.a2000@gmail.com>
---
v2:
 - Rebase onto staging-next. v1 was based on Linus' tree and did not
   apply, as staging-next already reworks wlan_bssdef.h.
 - Use my full name in From: and Signed-off-by:.
---
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 drivers/staging/rtl8723bs/include/wlan_bssdef.h  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index 179fae4d8fcc..deeaa9e46086 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -253,7 +253,7 @@ struct FW_Sta_Info {
 	u32 status;
 	u32 rx_pkt;
 	u32 retry;
-	NDIS_802_11_RATES_EX  SupportedRates;
+	u8  SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
 };
 
 /*
diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
index ff2cee2f3b99..9137057726ef 100644
--- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
@@ -14,8 +14,6 @@
 #define NDIS_802_11_LENGTH_SSID         32
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
-typedef unsigned char   NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX];  /*  Set of 16 data rates */
-
 struct ndis_802_11_ssid {
 	u32 ssid_length;
 	u8 ssid[32];
@@ -48,7 +46,7 @@ struct ndis_80211_var_ie {
  * ETH_ALEN + 2 +
  * sizeof (struct ndis_802_11_ssid) + sizeof (u32) +
  * sizeof (long) +
- * sizeof (struct ndis_802_11_conf) + sizeof (NDIS_802_11_RATES_EX) + ie_length
+ * sizeof (struct ndis_802_11_conf) + NDIS_802_11_LENGTH_RATES_EX + ie_length
  *
  * Except for ie_length, all other fields are fixed length. Therefore, we can
  * define a macro to present the partial sum.
@@ -140,7 +138,7 @@ struct wlan_bssid_ex {
 	long rssi;/* in dBM, raw data , get from PHY) */
 	struct ndis_802_11_conf configuration;
 	enum nl80211_iftype infrastructure_mode;
-	NDIS_802_11_RATES_EX supported_rates;
+	u8 supported_rates[NDIS_802_11_LENGTH_RATES_EX];
 	struct wlan_phy_info phy_info;
 	u32 ie_length;
 	u8 ies[MAX_IE_SZ];	/* timestamp, beacon interval, and capability information) */
-- 
2.43.0