staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in os_dep
cover staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in os_dep
This series replaces bare uses of 'uint' with 'unsigned int' in the os_dep directory of the rtl8723bs staging driver. This covers the remaining files not addressed by previous patches, as part of cleaning up unusual variable types listed in the driver's TODO file.
Note: os_intfs.c lines using 'uint' as module_param type specifier are intentionally left unchanged as that is a kernel API requirement.
Each patch addresses one file independently.
Moksh Panicker (3):
staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in
ioctl_cfg80211.c
staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in
xmit_linux.c
staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in
os_intfs.c
drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 4 ++-- drivers/staging/rtl8723bs/include/xmit_osdep.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 ++++++------ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/3 staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in ioctl_cfg80211.c
Replace bare use of 'uint' with 'unsigned int' in function parameters and local variables in ioctl_cfg80211.c and its corresponding header ioctl_cfg80211.h. This fixes the following checkpatch.pl warning:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
--- drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 4 ++-- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/include/ioctl_cfg80211.h +2 -2
@@ -42,10 +42,10 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter);void rtw_cfg80211_indicate_disconnect (struct adapter *padapter);void rtw_cfg80211_indicate_scan_done (struct adapter *adapter,bool aborted); -void rtw_cfg80211_indicate_sta_assoc (struct adapter *padapter,u8 *pmgmt_frame,uint frame_len); +void rtw_cfg80211_indicate_sta_assoc (struct adapter *padapter,u8 *pmgmt_frame,unsigned int frame_len);void rtw_cfg80211_indicate_sta_disassoc (struct adapter *padapter,unsigned char *da,unsigned short reason); -void rtw_cfg80211_rx_action (struct adapter *adapter,u8 *frame,uint frame_len,const char *msg); +void rtw_cfg80211_rx_action (struct adapter *adapter,u8 *frame,unsigned int frame_len,const char *msg);bool rtw_cfg80211_pwr_mgmt (struct adapter *adapter);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +6 -6
@@ -1152,7 +1152,7 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)static int rtw_cfg80211_set_probe_req_wpsp2pie (struct adapter *padapter,char *buf,int len) {int ret =0 ; -uint wps_ielen =0 ; +unsigned int wps_ielen =0 ;u8 *wps_ie;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -1515,12 +1515,12 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel } {/* handle wps_ie */ -uint wps_ielen; +unsigned int wps_ielen;u8 *wps_ie; wps_ie =rtw_get_wps_ie (buf, ielen,NULL , &wps_ielen);if (wps_ie && wps_ielen >0 ) { - padapter->securitypriv.wps_ie_len =min_t (uint, wps_ielen,MAX_WPS_IE_LEN ); + padapter->securitypriv.wps_ie_len = min_t(unsigned int, wps_ielen, MAX_WPS_IE_LEN);memcpy (padapter->securitypriv.wps_ie, wps_ie, padapter->securitypriv.wps_ie_len);set_fwstate (&padapter->mlmepriv,WIFI_UNDER_WPS ); }else {
@@ -1911,7 +1911,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy,return 0 ; } -void rtw_cfg80211_indicate_sta_assoc (struct adapter *padapter,u8 *pmgmt_frame,uint frame_len) +void rtw_cfg80211_indicate_sta_assoc (struct adapter *padapter,u8 *pmgmt_frame,unsigned int frame_len) {struct wireless_dev *wdev = padapter->rtw_wdev;
@@ -2247,7 +2247,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l {int ret =0 ;u8 *pbuf =NULL ; -uint len, wps_ielen =0 ; +unsigned int len, wps_ielen =0 ;struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))
@@ -2442,7 +2442,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy,return ret; } -void rtw_cfg80211_rx_action (struct adapter *adapter,u8 *frame,uint frame_len,const char *msg) +void rtw_cfg80211_rx_action (struct adapter *adapter,u8 *frame,unsigned int frame_len,const char *msg) {s32 freq;int channel;
Signature · 1 line
2.34.1
PATCH 2/3 staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in xmit_linux.c
In reply to Moksh PanickerReplace 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
@@ -32,7 +32,7 @@ void rtw_os_xmit_schedule(struct adapter *padapter);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
@@ -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
PATCH 3/3 staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in os_intfs.c
In reply to Moksh PanickerReplace bare use of 'uint' with 'unsigned int' for the status variable in rtw_drv_init(). The module_param() uses of 'uint' are intentional and left unchanged. This fixes the following checkpatch.pl warning:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
--- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -791,7 +791,7 @@ int rtw_drv_register_netdev(struct adapter *if1)static int _netdev_open (struct net_device *pnetdev) { -uint status; +unsigned int status;struct adapter *padapter =rtw_netdev_priv (pnetdev);struct pwrctrl_priv *pwrctrlpriv =adapter_to_pwrctl (padapter);
Signature · 1 line
2.34.1