Fix some of the sparse warnings

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-09 16:00:41 -05:00
parent d4fa4d178f
commit 300892ebfd
14 changed files with 686 additions and 767 deletions

View file

@ -2301,7 +2301,7 @@ _func_exit_;
#endif
#if (RATE_ADAPTIVE_SUPPORT==1)
void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime)
static void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime)
{
rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&minRptTime));
}
@ -2344,7 +2344,7 @@ _func_exit_;
#endif
#ifdef CONFIG_ANTENNA_DIVERSITY
void antenna_select_wk_hdl(_adapter *padapter, u8 antenna)
static void antenna_select_wk_hdl(_adapter *padapter, u8 antenna)
{
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna));
}
@ -2605,7 +2605,7 @@ exit:
return res;
}
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
static s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{
s32 ret = _FAIL;
u8 buf[16];

View file

@ -84,7 +84,7 @@ int proc_get_write_reg(char *page, char **start,
return 0;
}
int proc_set_write_reg(struct file *file, const char *buffer,
int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -168,7 +168,7 @@ int proc_get_read_reg(char *page, char **start,
}
int proc_set_read_reg(struct file *file, const char *buffer,
int proc_set_read_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
char tmp[16];
@ -651,7 +651,7 @@ int proc_get_rx_signal(char *page, char **start,
return len;
}
int proc_set_rx_signal(struct file *file, const char *buffer,
int proc_set_rx_signal(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -709,7 +709,7 @@ int proc_get_ht_enable(char *page, char **start,
return len;
}
int proc_set_ht_enable(struct file *file, const char *buffer,
int proc_set_ht_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -756,7 +756,7 @@ int proc_get_cbw40_enable(char *page, char **start,
return len;
}
int proc_set_cbw40_enable(struct file *file, const char *buffer,
int proc_set_cbw40_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -805,7 +805,7 @@ int proc_get_ampdu_enable(char *page, char **start,
return len;
}
int proc_set_ampdu_enable(struct file *file, const char *buffer,
int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -874,7 +874,7 @@ int proc_get_rx_stbc(char *page, char **start,
return len;
}
int proc_set_rx_stbc(struct file *file, const char *buffer,
int proc_set_rx_stbc(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -911,7 +911,7 @@ int proc_get_rssi_disp(char *page, char **start,
return 0;
}
int proc_set_rssi_disp(struct file *file, const char *buffer,
int proc_set_rssi_disp(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
@ -1134,7 +1134,7 @@ int proc_get_btcoex_dbg(char *page, char **start,
return len;
}
int proc_set_btcoex_dbg(struct file *file, const char *buffer,
int proc_set_btcoex_dbg(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;

View file

@ -32,7 +32,7 @@
#include <rtl8723a_hal.h>
#endif
struct mlme_handler mlme_sta_tbl[]={
static struct mlme_handler mlme_sta_tbl[]={
{WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq},
{WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp},
{WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq},
@ -76,7 +76,7 @@ struct mlme_handler mlme_ap_tbl[]={
};
#endif
struct action_handler OnAction_tbl[]={
static struct action_handler OnAction_tbl[]={
{RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct},
{RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos},
{RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls},
@ -91,7 +91,7 @@ struct action_handler OnAction_tbl[]={
};
u8 null_addr[ETH_ALEN]= {0,0,0,0,0,0};
static u8 null_addr[ETH_ALEN]= {0,0,0,0,0,0};
/**************************************************
OUI definitions for the vendor specific IE
@ -113,12 +113,7 @@ extern unsigned char REALTEK_96B_IE[];
/********************************************************
MCS rate definitions
*********************************************************/
#ifdef CONFIG_DISABLE_MCS13TO15
unsigned char MCS_rate_2R_MCS13TO15_OFF[16] = {0xff, 0x1f, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
#else //CONFIG_DISABLE_MCS13TO15
unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
#endif //CONFIG_DISABLE_MCS13TO15
unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
/********************************************************
@ -759,7 +754,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
}
#ifdef CONFIG_P2P
u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da)
static u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da)
{
bool response = _TRUE;
@ -2437,7 +2432,7 @@ unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS;
}
unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len)
static unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len)
{
unsigned int ret = _FAIL;
struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv;

View file

@ -886,7 +886,7 @@ void SetTxPower(PADAPTER pAdapter)
Hal_SetTxPower(pAdapter);
}
void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset)
static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset)
{
u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC;
@ -970,13 +970,13 @@ void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart)
Hal_SetCarrierSuppressionTx(pAdapter, bStart);
}
void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)
static void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetCCKContinuousTx(pAdapter,bStart);
}
void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart)
static void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetOFDMContinuousTx( pAdapter, bStart);

View file

@ -869,7 +869,7 @@ _func_enter_;
return NDIS_STATUS_NOT_ACCEPTED;
_irqlevel_changed_(&oldirql, LOWER);
rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, 0);
rtw_hal_set_hwreg(Adapter, HW_VAR_TRIGGER_GPIO_0, NULL);
_irqlevel_changed_(&oldirql, RAISE);
_func_exit_;

View file

@ -45,7 +45,7 @@ ODM_DIG_LowerBound_88E(
}
#if (defined(CONFIG_HW_ANTENNA_DIVERSITY))
VOID
static VOID
odm_RX_HWAntDivInit(
IN PDM_ODM_T pDM_Odm
)
@ -83,7 +83,7 @@ odm_RX_HWAntDivInit(
//ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv
}
VOID
static VOID
odm_TRX_HWAntDivInit(
IN PDM_ODM_T pDM_Odm
)
@ -134,7 +134,7 @@ odm_TRX_HWAntDivInit(
//ODM_SetBBReg(pDM_Odm, 0xa00 , BIT15, 1); //Enable CCK AntDiv
}
VOID
static VOID
odm_FastAntTrainingInit(
IN PDM_ODM_T pDM_Odm
)
@ -316,7 +316,7 @@ ODM_UpdateRxIdleAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant)
}
VOID
static VOID
odm_UpdateTxAnt_88E(IN PDM_ODM_T pDM_Odm, IN u1Byte Ant, IN u4Byte MacId)
{
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
@ -407,7 +407,7 @@ ODM_AntselStatistics_88E(
}
#define TX_BY_REG 0
VOID
static VOID
odm_HWAntDiv(
IN PDM_ODM_T pDM_Odm
)

View file

@ -22,8 +22,8 @@
#include <osdep_service.h>
#include <drv_types.h>
#include <rtl8188e_hal.h>
#include <rtl8188e_led.h>
//================================================================================
// LED object.
//================================================================================
@ -41,11 +41,7 @@
// Description:
// Turn on LED according to LedPin specified.
//
void
SwLedOn(
_adapter *padapter,
PLED_871x pLed
)
void SwLedOn(_adapter *padapter, PLED_871x pLed)
{
u8 LedCfg;
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -78,11 +74,7 @@ SwLedOn(
// Description:
// Turn off LED according to LedPin specified.
//
void
SwLedOff(
_adapter *padapter,
PLED_871x pLed
)
void SwLedOff(_adapter *padapter, PLED_871x pLed)
{
u8 LedCfg;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);

View file

@ -353,7 +353,7 @@ typedef struct _EDCA_TURBO_
{
BOOLEAN bCurrentTurboEDCA;
BOOLEAN bIsCurRDLState;
#if (DM_ODM_SUPPORT_TYPE == ODM_CE )
#if (DM_ODM_SUPPORT_TYPE == ODM_CE)
u4Byte prv_traffic_idx; // edca turbo
#endif

View file

@ -28,19 +28,10 @@
//================================================================================
// Interface to manipulate LED objects.
//================================================================================
#ifdef CONFIG_USB_HCI
void rtl8188eu_InitSwLeds(PADAPTER padapter);
void rtl8188eu_DeInitSwLeds(PADAPTER padapter);
#endif
#ifdef CONFIG_PCI_HCI
void rtl8188ee_gen_RefreshLedState(PADAPTER Adapter);
void rtl8188ee_InitSwLeds(PADAPTER padapter);
void rtl8188ee_DeInitSwLeds(PADAPTER padapter);
#endif
#ifdef CONFIG_SDIO_HCI
void rtl8188es_InitSwLeds(PADAPTER padapter);
void rtl8188es_DeInitSwLeds(PADAPTER padapter);
#endif
void SwLedOn(_adapter *padapter, PLED_871x pLed);
void SwLedOff(_adapter *padapter, PLED_871x pLed);
#endif

View file

@ -290,14 +290,14 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count,
int *eof, void *data);
int proc_set_write_reg(struct file *file, const char *buffer,
int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data);
int proc_get_read_reg(char *page, char **start,
off_t offset, int count,
int *eof, void *data);
int proc_set_read_reg(struct file *file, const char *buffer,
int proc_set_read_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data);
@ -401,7 +401,7 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count,
int *eof, void *data);
int proc_set_rx_signal(struct file *file, const char *buffer,
int proc_set_rx_signal(struct file *file, const char __user *buffer,
unsigned long count, void *data);
#ifdef CONFIG_80211N_HT
@ -409,28 +409,28 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count,
int *eof, void *data);
int proc_set_ht_enable(struct file *file, const char *buffer,
int proc_set_ht_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data);
int proc_get_cbw40_enable(char *page, char **start,
off_t offset, int count,
int *eof, void *data);
int proc_set_cbw40_enable(struct file *file, const char *buffer,
int proc_set_cbw40_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data);
int proc_get_ampdu_enable(char *page, char **start,
off_t offset, int count,
int *eof, void *data);
int proc_set_ampdu_enable(struct file *file, const char *buffer,
int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data);
int proc_get_rx_stbc(char *page, char **start,
off_t offset, int count,
int *eof, void *data);
int proc_set_rx_stbc(struct file *file, const char *buffer,
int proc_set_rx_stbc(struct file *file, const char __user *buffer,
unsigned long count, void *data);
#endif //CONFIG_80211N_HT
@ -442,7 +442,7 @@ extern void rtl871x_cedbg(const char *fmt, ...);
off_t offset, int count,
int *eof, void *data);
int proc_set_rssi_disp(struct file *file, const char *buffer,
int proc_set_rssi_disp(struct file *file, const char __user *buffer,
unsigned long count, void *data);
#ifdef CONFIG_BT_COEXIST

View file

@ -577,6 +577,14 @@ extern void hostapd_mode_unload(_adapter *padapter);
#endif
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_2R[16];
extern unsigned char MCS_rate_1R[16];
extern void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf);
extern void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf);
@ -585,6 +593,9 @@ extern void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_atimdone_event_callback(_adapter *adapter, u8 *pbuf);
extern void rtw_cpwm_event_callback(_adapter *adapter, u8 *pbuf);
void indicate_wx_scan_complete_event(_adapter *padapter);
void rtw_indicate_wx_assoc_event(_adapter *padapter);
void rtw_indicate_wx_disassoc_event(_adapter *padapter);
#ifdef PLATFORM_WINDOWS
extern thread_return event_thread(void *context);

View file

@ -204,7 +204,7 @@ NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv);
#ifdef _RTW_MP_IOCTL_C_
const struct oid_obj_priv oid_rtl_seg_81_80_00[] =
static const struct oid_obj_priv oid_rtl_seg_81_80_00[] =
{
{1, &oid_null_function}, //0x00 OID_RT_PRO_RESET_DUT
{1, &oid_rt_pro_set_data_rate_hdl}, //0x01
@ -241,7 +241,7 @@ const struct oid_obj_priv oid_rtl_seg_81_80_00[] =
};
const struct oid_obj_priv oid_rtl_seg_81_80_20[] =
static const struct oid_obj_priv oid_rtl_seg_81_80_20[] =
{
{1, &oid_null_function}, //0x20 OID_RT_PRO_READ_POWER_CONTROL
{1, &oid_null_function}, //0x21 OID_RT_PRO_WRITE_EEPROM
@ -262,7 +262,7 @@ const struct oid_obj_priv oid_rtl_seg_81_80_20[] =
};
const struct oid_obj_priv oid_rtl_seg_81_80_40[] =
static const struct oid_obj_priv oid_rtl_seg_81_80_40[] =
{
{1, &oid_null_function}, //0x40
{1, &oid_null_function}, //0x41
@ -272,7 +272,7 @@ const struct oid_obj_priv oid_rtl_seg_81_80_40[] =
{1, &oid_null_function} //0x45
};
const struct oid_obj_priv oid_rtl_seg_81_80_80[] =
static const struct oid_obj_priv oid_rtl_seg_81_80_80[] =
{
{1, &oid_null_function}, //0x80 OID_RT_DRIVER_OPTION
{1, &oid_null_function}, //0x81 OID_RT_RF_OFF
@ -280,12 +280,12 @@ const struct oid_obj_priv oid_rtl_seg_81_80_80[] =
};
const struct oid_obj_priv oid_rtl_seg_81_85[] =
static const struct oid_obj_priv oid_rtl_seg_81_85[] =
{
{1, &oid_rt_wireless_mode_hdl} //0x00 OID_RT_WIRELESS_MODE
};
struct oid_obj_priv oid_rtl_seg_81_87[] =
static struct oid_obj_priv oid_rtl_seg_81_87[] =
{
{1, &oid_null_function}, //0x80 OID_RT_PRO8187_WI_POLL
{1, &oid_rt_pro_write_bb_reg_hdl}, //0x81
@ -294,7 +294,7 @@ struct oid_obj_priv oid_rtl_seg_81_87[] =
{1, &oid_rt_pro_read_rf_reg_hdl} //0x83
};
struct oid_obj_priv oid_rtl_seg_87_11_00[] =
static struct oid_obj_priv oid_rtl_seg_87_11_00[] =
{
{1, &oid_rt_pro8711_join_bss_hdl}, //0x00 //S
{1, &oid_rt_pro_read_register_hdl}, //0x01
@ -330,7 +330,7 @@ struct oid_obj_priv oid_rtl_seg_87_11_00[] =
{1, &oid_rt_poll_rx_status_hdl} //0X1F
};
struct oid_obj_priv oid_rtl_seg_87_11_20[] =
static struct oid_obj_priv oid_rtl_seg_87_11_20[] =
{
{1, &oid_rt_pro_cfg_debug_message_hdl}, //0x20
{1, &oid_rt_pro_set_data_rate_ex_hdl}, //0x21
@ -340,23 +340,23 @@ struct oid_obj_priv oid_rtl_seg_87_11_20[] =
};
struct oid_obj_priv oid_rtl_seg_87_11_50[] =
static struct oid_obj_priv oid_rtl_seg_87_11_50[] =
{
{1, &oid_rt_pro_qry_pwrstate_hdl}, //0x50
{1, &oid_rt_pro_set_pwrstate_hdl} //0x51
};
struct oid_obj_priv oid_rtl_seg_87_11_80[] =
static struct oid_obj_priv oid_rtl_seg_87_11_80[] =
{
{1, &oid_null_function} //0x80
};
struct oid_obj_priv oid_rtl_seg_87_11_B0[] =
static struct oid_obj_priv oid_rtl_seg_87_11_B0[] =
{
{1, &oid_null_function} //0xB0
};
struct oid_obj_priv oid_rtl_seg_87_11_F0[] =
static struct oid_obj_priv oid_rtl_seg_87_11_F0[] =
{
{1, &oid_null_function}, //0xF0
{1, &oid_null_function}, //0xF1
@ -377,7 +377,7 @@ struct oid_obj_priv oid_rtl_seg_87_11_F0[] =
};
struct oid_obj_priv oid_rtl_seg_87_12_00[]=
static struct oid_obj_priv oid_rtl_seg_87_12_00[]=
{
{1, &oid_rt_pro_encryption_ctrl_hdl}, //0x00 Q&S
{1, &oid_rt_pro_add_sta_info_hdl}, //0x01 S
@ -403,25 +403,6 @@ struct oid_obj_priv oid_rtl_seg_87_12_00[]=
{1, &oid_rt_get_power_mode_hdl} //0x15 Q OID_RT_GET_POWER_MODE
};
#else /* _RTL871X_MP_IOCTL_C_ */
extern struct oid_obj_priv oid_rtl_seg_81_80_00[32];
extern struct oid_obj_priv oid_rtl_seg_81_80_20[16];
extern struct oid_obj_priv oid_rtl_seg_81_80_40[6];
extern struct oid_obj_priv oid_rtl_seg_81_80_80[3];
extern struct oid_obj_priv oid_rtl_seg_81_85[1];
extern struct oid_obj_priv oid_rtl_seg_81_87[5];
extern struct oid_obj_priv oid_rtl_seg_87_11_00[32];
extern struct oid_obj_priv oid_rtl_seg_87_11_20[5];
extern struct oid_obj_priv oid_rtl_seg_87_11_50[2];
extern struct oid_obj_priv oid_rtl_seg_87_11_80[1];
extern struct oid_obj_priv oid_rtl_seg_87_11_B0[1];
extern struct oid_obj_priv oid_rtl_seg_87_11_F0[16];
extern struct oid_obj_priv oid_rtl_seg_87_12_00[32];
#endif /* _RTL871X_MP_IOCTL_C_ */
struct rwreg_param{

File diff suppressed because it is too large Load diff

View file

@ -137,9 +137,6 @@ void rtw_init_mlme_timer(_adapter *padapter)
#endif
}
extern void rtw_indicate_wx_assoc_event(_adapter *padapter);
extern void rtw_indicate_wx_disassoc_event(_adapter *padapter);
void rtw_os_indicate_connect(_adapter *adapter)
{