rtl8188eu: Clean up more Sparse messages

There are still problems remaining, but those are believed to be cosmetic.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-01-29 15:27:28 -06:00
parent 6dc546efc8
commit 481d6c817d
29 changed files with 281 additions and 376 deletions

View file

@ -4219,13 +4219,12 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8
u8 devinfo_content[64] = { 0x00 };
u16 capability = 0;
uint capability_len = 0;
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = 1;
u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_PROVISION_DISC_REQ;
u32 p2pielen = 0;
u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = 1;
__be32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_PROVISION_DISC_REQ;
u32 p2pielen = 0;
#ifdef CONFIG_WFD
u32 wfdielen = 0;
#endif //CONFIG_WFD
@ -5109,7 +5108,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
}
//add PUSH_BUTTON config_method by driver self in wpsie of probe_resp at GO Mode
if ( (puconfig_method = (u16*)rtw_get_wps_attr_content( wps_ie, wps_ielen, WPS_ATTR_CONF_METHOD , NULL, &attr_contentlen)) != NULL )
if ( (puconfig_method = (__be16*)rtw_get_wps_attr_content( wps_ie, wps_ielen, WPS_ATTR_CONF_METHOD , NULL, &attr_contentlen)) != NULL )
{
#ifdef CONFIG_DEBUG_CFG80211
//printk("config_method in wpsie of probe_resp = 0x%x\n", be16_to_cpu(*puconfig_method));

View file

@ -6168,33 +6168,33 @@ static int rtw_p2p_get(struct net_device *dev,
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
if ( padapter->bShowGetP2PState )
DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char *)wrqu->data.pointer );
DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (__force char *)wrqu->data.pointer );
if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) ) {
if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "status", 6 ) ) {
rtw_p2p_get_status( dev, info, wrqu, extra );
} else if ( _rtw_memcmp( wrqu->data.pointer, "role", 4 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "role", 4 ) ) {
rtw_p2p_get_role( dev, info, wrqu, extra);
} else if ( _rtw_memcmp( wrqu->data.pointer, "peer_ifa", 8 ) ) {
rtw_p2p_get_peer_ifaddr( dev, info, wrqu, extra);
} else if ( _rtw_memcmp( wrqu->data.pointer, "req_cm", 6 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "peer_ifa", 8 ) ) {
rtw_p2p_get_peer_ifaddr(dev, info, wrqu, extra);
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "req_cm", 6 ) ) {
rtw_p2p_get_req_cm( dev, info, wrqu, extra);
} else if ( _rtw_memcmp( wrqu->data.pointer, "peer_deva", 9 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "peer_deva", 9 ) ) {
// Get the P2P device address when receiving the provision discovery request frame.
rtw_p2p_get_peer_devaddr( dev, info, wrqu, extra);
} else if ( _rtw_memcmp( wrqu->data.pointer, "group_id", 8 ) ) {
rtw_p2p_get_peer_devaddr((__force void *)dev, info, wrqu, extra);
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "group_id", 8 ) ) {
rtw_p2p_get_groupid( dev, info, wrqu, extra);
} else if ( _rtw_memcmp( wrqu->data.pointer, "inv_peer_deva", 13 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "inv_peer_deva", 13 ) ) {
// Get the P2P device address when receiving the P2P Invitation request frame.
rtw_p2p_get_peer_devaddr_by_invitation( dev, info, wrqu, extra);
} else if ( _rtw_memcmp( wrqu->data.pointer, "op_ch", 5 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "op_ch", 5 ) ) {
rtw_p2p_get_op_ch( dev, info, wrqu, extra);
}
#ifdef CONFIG_WFD
else if ( _rtw_memcmp( wrqu->data.pointer, "peer_port", 9 ) ) {
else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "peer_port", 9 ) ) {
rtw_p2p_get_peer_wfd_port( dev, info, wrqu, extra );
} else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_sa", 6 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "wfd_sa", 6 ) ) {
rtw_p2p_get_peer_wfd_session_available( dev, info, wrqu, extra );
} else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_pc", 6 ) ) {
} else if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "wfd_pc", 6 ) ) {
rtw_p2p_get_peer_wfd_preferred_connection( dev, info, wrqu, extra );
}
#endif // CONFIG_WFD
@ -10354,25 +10354,23 @@ static int rtw_tdls_get(struct net_device *dev,
#ifdef CONFIG_WFD
DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer );
DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (__force char *)wrqu->data.pointer );
if ( _rtw_memcmp( wrqu->data.pointer, "ip", 2 ) )
if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "ip", 2 ) )
{
rtw_tdls_getip( dev, info, wrqu, extra );
}
if ( _rtw_memcmp( wrqu->data.pointer, "port", 4 ) )
if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "port", 4 ) )
{
rtw_tdls_getport( dev, info, wrqu, extra );
}
//WFDTDLS, for sigma test
if ( _rtw_memcmp( wrqu->data.pointer, "dis", 3 ) )
if ( _rtw_memcmp((__force void *)wrqu->data.pointer, "dis", 3 ) )
{
rtw_tdls_dis_result( dev, info, wrqu, extra );
}
if ( _rtw_memcmp(wrqu->data.pointer, "status", 6 ) )
{
if (_rtw_memcmp((__force void *)wrqu->data.pointer, "status", 6))
rtw_wfd_tdls_status( dev, info, wrqu, extra );
}
#endif //CONFIG_WFD

View file

@ -105,7 +105,7 @@ if (adapter->registrypriv.mp_mode == 1)
}
#ifdef CONFIG_SET_SCAN_DENY_TIMER
void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
static void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
{
struct adapter *adapter = (struct adapter *)FunctionContext;
rtw_set_scan_deny_timer_hdl(adapter);

View file

@ -25,6 +25,7 @@
#include <osdep_service.h>
#include <drv_types.h>
#include <recv_osdep.h>
#include <rtw_ioctl_set.h>
#include <linux/vmalloc.h>
#ifdef RTK_DMP_PLATFORM
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
@ -704,27 +705,6 @@ void _rtw_spinlock_free(_lock *plock)
{
}
void _rtw_spinlock(_lock *plock)
{
spin_lock(plock);
}
void _rtw_spinunlock(_lock *plock)
{
spin_unlock(plock);
}
void _rtw_spinlock_ex(_lock *plock)
{
spin_lock(plock);
}
void _rtw_spinunlock_ex(_lock *plock)
{
spin_unlock(plock);
}
void _rtw_init_queue(_queue *pqueue)
{
@ -828,7 +808,7 @@ void rtw_udelay_os(int us)
}
#endif
void rtw_yield_os()
void rtw_yield_os(void)
{
yield();
}
@ -849,7 +829,7 @@ static android_suspend_lock_t rtw_suspend_ext_lock ={
};
#endif
inline void rtw_suspend_lock_init()
inline void rtw_suspend_lock_init(void)
{
#ifdef CONFIG_WAKELOCK
wake_lock_init(&rtw_suspend_lock, WAKE_LOCK_SUSPEND, RTW_SUSPEND_LOCK_NAME);
@ -860,7 +840,7 @@ inline void rtw_suspend_lock_init()
#endif
}
inline void rtw_suspend_lock_uninit()
inline void rtw_suspend_lock_uninit(void)
{
#ifdef CONFIG_WAKELOCK
wake_lock_destroy(&rtw_suspend_lock);
@ -871,7 +851,7 @@ inline void rtw_suspend_lock_uninit()
#endif
}
inline void rtw_lock_suspend()
inline void rtw_lock_suspend(void)
{
#ifdef CONFIG_WAKELOCK
wake_lock(&rtw_suspend_lock);
@ -884,7 +864,7 @@ inline void rtw_lock_suspend()
#endif
}
inline void rtw_unlock_suspend()
inline void rtw_unlock_suspend(void)
{
#ifdef CONFIG_WAKELOCK
wake_unlock(&rtw_suspend_lock);
@ -1007,7 +987,7 @@ static int readFile(struct file *fp,char *buf,int len)
return -EPERM;
while(sum<len) {
rlen=fp->f_op->read(fp,buf+sum,len-sum, &fp->f_pos);
rlen=fp->f_op->read(fp,(char __user *)buf+sum,len-sum, &fp->f_pos);
if(rlen>0)
sum+=rlen;
else if(0 != rlen)
@ -1028,7 +1008,7 @@ static int writeFile(struct file *fp,char *buf,int len)
return -EPERM;
while(sum<len) {
wlen=fp->f_op->write(fp,buf+sum,len-sum, &fp->f_pos);
wlen=fp->f_op->write(fp,(char __user *)buf+sum,len-sum, &fp->f_pos);
if(wlen>0)
sum+=wlen;
else if(0 != wlen)

View file

@ -479,7 +479,7 @@ void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)
}
}
void _rtw_reordering_ctrl_timeout_handler (void *FunctionContext)
static void _rtw_reordering_ctrl_timeout_handler (void *FunctionContext)
{
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)FunctionContext;
rtw_reordering_ctrl_timeout_handler(preorder_ctrl);

View file

@ -362,12 +362,12 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit;
}
if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){
if (!access_ok(VERIFY_READ, (const void __user *)priv_cmd.buf, priv_cmd.total_len)){
DBG_871X("%s: failed to access memory\n", __FUNCTION__);
ret = -EFAULT;
goto exit;
}
if (copy_from_user(command, (void *)priv_cmd.buf, priv_cmd.total_len)) {
if (copy_from_user(command, (const void __user *)priv_cmd.buf, priv_cmd.total_len)) {
ret = -EFAULT;
goto exit;
}
@ -570,7 +570,7 @@ response:
bytes_written++;
}
priv_cmd.used_len = bytes_written;
if (copy_to_user((void *)priv_cmd.buf, command, bytes_written)) {
if (copy_to_user((void __user *)priv_cmd.buf, command, bytes_written)) {
DBG_871X("%s: failed to copy data to user buffer\n", __FUNCTION__);
ret = -EFAULT;
}