Skip to contentSkip to conversation

staging: rtl8188eu: change array type to const u8

PATCH New Michael Straube 1 participant 4 messages Oct 4, 2018 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

PATCH 1/4 staging: rtl8188eu: change array type to const u8

Change the type of MCS_rate_1R from unsigned char to const u8.

Suggested-by Joe Perches <[email protected]>
Signed-off-by Michael Straube <[email protected]>

---

NOTE:
This series depends on the previous sent series. [1/3] staging: rtl8188eu: fix line over 80 characters - style

 drivers/staging/rtl8188eu/core/rtw_mlme.c     | 2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
 drivers/staging/rtl8188eu/include/rtw_mlme.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -1
index 858b597cb506..6302be43c2e0 100644
@@ -20,7 +20,7 @@
 #include <rtw_ioctl_set.h>
 #include <linux/vmalloc.h>
 
-extern unsigned char	MCS_rate_1R[16];
+extern const u8 MCS_rate_1R[16];
 
 int rtw_init_mlme_priv(struct adapter *padapter)
 {
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1 -1
index c6945164ee34..6790b840aef8 100644
@@ -39,7 +39,7 @@ extern unsigned char REALTEK_96B_IE[];
 /********************************************************
 MCS rate definitions
 *********************************************************/
-unsigned char MCS_rate_1R[16] = {
+const u8 MCS_rate_1R[16] = {
 	0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
drivers/staging/rtl8188eu/include/rtw_mlme.h +1 -1
index 49d23aef47df..8d9d663f0645 100644
@@ -214,7 +214,7 @@ void hostapd_mode_unload(struct adapter *padapter);
 extern unsigned char WPA_TKIP_CIPHER[4];
 extern unsigned char RSN_TKIP_CIPHER[4];
 extern unsigned char REALTEK_96B_IE[];
-extern unsigned char	MCS_rate_1R[16];
+extern const u8 MCS_rate_1R[16];
 
 void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf);
 void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf);
Signature · 1 line
2.19.0
author
#1 lore raw

PATCH 2/4 staging: rtl8188eu: make struct field of mlme_handler const

The strings in the uses of struct mlme_handler are constant. Change the type of field str from 'char *' to 'const char *'.

Suggested-by Joe Perches <[email protected]>
Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +1 -1
index ade68af15e04..3e8a0ab46ff2 100644
@@ -232,7 +232,7 @@ enum SCAN_STATE {
 
 struct mlme_handler {
 	unsigned int   num;
-	char *str;
+	const char *str;
 	unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
 };
Signature · 1 line
2.19.0
author
#2 lore raw

PATCH 3/4 staging: rtl8188eu: make struct field of action_handler const

In reply to Michael Straube

The strings in the use of struct action_handler are constant. Change the type of field str from 'char *' to 'const char *'.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +1 -1
index 3e8a0ab46ff2..38911a7daa95 100644
@@ -238,7 +238,7 @@ struct mlme_handler {
 
 struct action_handler {
 	unsigned int   num;
-	char *str;
+	const char *str;
 	unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
 };
Signature · 1 line
2.19.0
author
#3 lore raw

PATCH 4/4 staging: rtl8188eu: remove whitespace in rtw_mlme_ext.h

In reply to Michael Straube

Remove spaces and/or replace tabs with spaces in some declarations in rtw_mlme_ext.h.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +7 -7
index 38911a7daa95..9526da3efcc4 100644
@@ -231,22 +231,22 @@ enum SCAN_STATE {
 };
 
 struct mlme_handler {
-	unsigned int   num;
+	unsigned int num;
 	const char *str;
 	unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
 };
 
 struct action_handler {
-	unsigned int   num;
+	unsigned int num;
 	const char *str;
 	unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
 };
 
-struct	ss_res {
-	int	state;
-	int	bss_cnt;
-	int	channel_idx;
-	int	scan_mode;
+struct ss_res {
+	int state;
+	int bss_cnt;
+	int channel_idx;
+	int scan_mode;
 	u8 ssid_num;
 	u8 ch_num;
 	struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
Signature · 1 line
2.19.0