Skip to contentSkip to conversation

staging: rtl8723bs: Replace bare 'uint' with 'unsigned int'

PATCH In review Moksh Panicker 2 participants 5 messages Jun 19 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: Replace bare 'uint' with 'unsigned int'

This series replaces bare uses of 'uint' with 'unsigned int' in the rtl8723bs staging driver, as part of cleaning up unusual variable types listed in the driver's TODO file.

Each patch addresses one file independently.

Moksh Panicker (3):
staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_cmd.c
staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in xmit_linux.c
staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_ap.c

#1 lore raw

PATCH 1/3 staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_cmd.c

Replace bare use of 'uint' with 'unsigned int' in rtw_joinbss_cmd(). This fixes the following checkpatch.pl warning:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

---
 drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
index c1185c25e..e6054d814 100644
@@ -672,7 +672,7 @@ int rtw_startbss_cmd(struct adapter  *padapter, int flags)
 u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
 {
 	u8 res = _SUCCESS;
-	uint	t_len = 0;
+	unsigned int	t_len = 0;
 	struct wlan_bssid_ex *psecnetwork;
 	struct cmd_obj *pcmd;
 	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 1/3] staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_cmd.c

Quoted 6 lines · Moksh Panicker

Replace bare use of 'uint' with 'unsigned int' in rtw_joinbss_cmd(). This fixes the following checkpatch.pl warning:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

---

Someone already did this. Please work against devel-next or linux-next.

regards,
dan carpenter

#3 lore raw

PATCH 2/3 staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in xmit_linux.c

In reply to Moksh Panicker

Replace bare use of 'uint' with 'unsigned int' in rtw_remainder_len() function definition and its declaration in xmit_osdep.h. This fixes the following checkpatch.pl warning:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

---
 drivers/staging/rtl8723bs/include/xmit_osdep.h | 2 +-
 drivers/staging/rtl8723bs/os_dep/xmit_linux.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/include/xmit_osdep.h +1 -1
index 880344bff..b47b3f0c6 100644
@@ -33,7 +33,7 @@ void rtw_os_xmit_schedule(struct adapter *padapter);
 int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz, u8 flag);
 void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz, u8 flag);
 
-extern uint rtw_remainder_len(struct pkt_file *pfile);
+extern unsigned int rtw_remainder_len(struct pkt_file *pfile);
 extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
 int _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, unsigned int rlen);
 extern signed int rtw_endofpktfile(struct pkt_file *pfile);
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +1 -1
index dc0b77f38..5c82b60cb 100644
@@ -7,7 +7,7 @@
 #include <drv_types.h>
 
 
-uint rtw_remainder_len(struct pkt_file *pfile)
+unsigned int rtw_remainder_len(struct pkt_file *pfile)
 {
 	return (pfile->buf_len - ((SIZE_PTR)(pfile->cur_addr) - (SIZE_PTR)(pfile->buf_start)));
 }
Signature · 1 line
2.34.1
#4 lore raw

PATCH 3/3 staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_ap.c

In reply to Moksh Panicker

Replace bare use of 'uint' with 'unsigned int' in multiple functions in rtw_ap.c. This fixes the following checkpatch.pl warning:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +6 -6
index 4b4012411..d4aca0c0c 100644
@@ -60,7 +60,7 @@ static void update_BCNTIM(struct adapter *padapter)
 	/* update TIM IE */
 	u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
 	__le16 tim_bitmap_le;
-	uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
+	unsigned int offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
 
 	tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
 
@@ -156,7 +156,7 @@ static void update_BCNTIM(struct adapter *padapter)
 		kfree(pbackup_remainder_ie);
 	}
 
-	offset =  (uint)(dst_ie - pie);
+	offset =  (unsigned int)(dst_ie - pie);
 	pnetwork_mlmeext->ie_length = offset + remainder_ielen;
 }
 
@@ -801,7 +801,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 	u8 *pHT_info_ie = NULL;
 	struct sta_info *psta = NULL;
 	u16 cap, ht_cap = false;
-	uint ie_len = 0;
+	unsigned int ie_len = 0;
 	int group_cipher, pairwise_cipher;
 	u8 channel, network_type, support_rate[NDIS_802_11_LENGTH_RATES_EX];
 	int support_rate_num = 0;
@@ -1408,7 +1408,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
 	u8 *premainder_ie;
 	u8 *pbackup_remainder_ie = NULL;
 
-	uint wps_ielen = 0, wps_offset, remainder_ielen;
+	unsigned int wps_ielen = 0, wps_offset, remainder_ielen;
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -1428,7 +1428,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
 	if (!pwps_ie_src)
 		return;
 
-	wps_offset = (uint)(pwps_ie - ie);
+	wps_offset = (unsigned int)(pwps_ie - ie);
 
 	premainder_ie = pwps_ie + wps_ielen;
 
@@ -1437,7 +1437,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
 	if (remainder_ielen)
 		pbackup_remainder_ie = kmemdup(premainder_ie, remainder_ielen, GFP_ATOMIC);
 
-	wps_ielen = (uint)pwps_ie_src[1];/* to get ie data len */
+	wps_ielen = (unsigned int)pwps_ie_src[1];/* to get ie data len */
 	if ((wps_offset + wps_ielen + 2 + remainder_ielen) <= MAX_IE_SZ) {
 		memcpy(pwps_ie, pwps_ie_src, wps_ielen + 2);
 		pwps_ie += (wps_ielen + 2);
Signature · 1 line
2.34.1