rtl8723ds: Fix some checkpatch warnings and change default log level

The default debug level is reduced from 4 to 2.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2017-10-16 16:27:15 -05:00
parent 57b8112292
commit 27368d0b9c
12 changed files with 36 additions and 36 deletions

View File

@ -74,9 +74,9 @@ CONFIG_RTW_NAPI = y
CONFIG_RTW_GRO = y CONFIG_RTW_GRO = y
########################## Debug ########################### ########################## Debug ###########################
CONFIG_RTW_DEBUG = y CONFIG_RTW_DEBUG = y
# default log level is _DRV_INFO_ = 4, # default log level is _DRV_INFO_ = 2,
# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
CONFIG_RTW_LOG_LEVEL = 4 CONFIG_RTW_LOG_LEVEL = 2
######################## Wake On Lan ########################## ######################## Wake On Lan ##########################
CONFIG_WOWLAN = n CONFIG_WOWLAN = n
CONFIG_GPIO_WAKEUP = n CONFIG_GPIO_WAKEUP = n

View File

@ -2141,7 +2141,7 @@ exit:
return res; return res;
} }
u8 _rtw_set_chplan_cmd(_adapter *adapter, int flags, u8 chplan, const struct country_chplan *country_ent, u8 swconfig) static u8 _rtw_set_chplan_cmd(_adapter *adapter, int flags, u8 chplan, const struct country_chplan *country_ent, u8 swconfig)
{ {
struct cmd_obj *cmdobj; struct cmd_obj *cmdobj;
struct SetChannelPlan_param *parm; struct SetChannelPlan_param *parm;
@ -2675,7 +2675,7 @@ void rtw_iface_dynamic_chk_wk_hdl(_adapter *padapter)
#endif #endif
} }
void rtw_dynamic_chk_wk_hdl(_adapter *padapter) static void rtw_dynamic_chk_wk_hdl(_adapter *padapter)
{ {
rtw_mi_dynamic_chk_wk_hdl(padapter); rtw_mi_dynamic_chk_wk_hdl(padapter);
@ -2835,7 +2835,7 @@ exit:
} }
void rtw_dm_in_lps_hdl(_adapter *padapter) static void rtw_dm_in_lps_hdl(_adapter *padapter)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_DM_IN_LPS, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_DM_IN_LPS, NULL);
} }
@ -2876,7 +2876,7 @@ exit:
} }
void rtw_lps_change_dtim_hdl(_adapter *padapter, u8 dtim) static void rtw_lps_change_dtim_hdl(_adapter *padapter, u8 dtim)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -3055,7 +3055,7 @@ exit:
} }
#endif #endif
void rtw_dm_ra_mask_hdl(_adapter *padapter, struct sta_info *psta) static void rtw_dm_ra_mask_hdl(_adapter *padapter, struct sta_info *psta)
{ {
if (psta) if (psta)
set_sta_rate(padapter, psta); set_sta_rate(padapter, psta);
@ -3097,18 +3097,18 @@ exit:
} }
void power_saving_wk_hdl(_adapter *padapter) static void power_saving_wk_hdl(_adapter *padapter)
{ {
rtw_ps_processor(padapter); rtw_ps_processor(padapter);
} }
/* add for CONFIG_IEEE80211W, none 11w can use it */ /* add for CONFIG_IEEE80211W, none 11w can use it */
void reset_securitypriv_hdl(_adapter *padapter) static void reset_securitypriv_hdl(_adapter *padapter)
{ {
rtw_reset_securitypriv(padapter); rtw_reset_securitypriv(padapter);
} }
void free_assoc_resources_hdl(_adapter *padapter) static void free_assoc_resources_hdl(_adapter *padapter)
{ {
rtw_free_assoc_resources(padapter, 1); rtw_free_assoc_resources(padapter, 1);
} }
@ -3679,7 +3679,7 @@ struct btinfo {
u8 rsvd_7; u8 rsvd_7;
}; };
void btinfo_evt_dump(void *sel, void *buf) static void btinfo_evt_dump(void *sel, void *buf)
{ {
struct btinfo *info = (struct btinfo *)buf; struct btinfo *info = (struct btinfo *)buf;
@ -3928,7 +3928,7 @@ inline u8 rtw_customer_str_write_cmd(_adapter *adapter, const u8 *cstr)
} }
#endif /* CONFIG_RTW_CUSTOMER_STR */ #endif /* CONFIG_RTW_CUSTOMER_STR */
u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *pbuf, u16 length, u8 type) static u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *pbuf, u16 length, u8 type)
{ {
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -4046,7 +4046,7 @@ exit:
} }
#endif /* CONFIG_FW_C2H_REG */ #endif /* CONFIG_FW_C2H_REG */
u8 session_tracker_cmd(_adapter *adapter, u8 cmd, struct sta_info *sta, u8 *local_naddr, u8 *local_port, u8 *remote_naddr, u8 *remote_port) static u8 session_tracker_cmd(_adapter *adapter, u8 cmd, struct sta_info *sta, u8 *local_naddr, u8 *local_port, u8 *remote_naddr, u8 *remote_port)
{ {
struct cmd_priv *cmdpriv = &adapter->cmdpriv; struct cmd_priv *cmdpriv = &adapter->cmdpriv;
struct cmd_obj *cmdobj; struct cmd_obj *cmdobj;
@ -4112,7 +4112,7 @@ inline u8 session_tracker_del_cmd(_adapter *adapter, struct sta_info *sta, u8 *l
return session_tracker_cmd(adapter, ST_CMD_DEL, sta, local_naddr, local_port, remote_naddr, remote_port); return session_tracker_cmd(adapter, ST_CMD_DEL, sta, local_naddr, local_port, remote_naddr, remote_port);
} }
void session_tracker_chk_for_sta(_adapter *adapter, struct sta_info *sta) static void session_tracker_chk_for_sta(_adapter *adapter, struct sta_info *sta)
{ {
struct st_ctl_t *st_ctl = &sta->st_ctl; struct st_ctl_t *st_ctl = &sta->st_ctl;
int i; int i;
@ -4166,11 +4166,11 @@ void session_tracker_chk_for_sta(_adapter *adapter, struct sta_info *sta)
RTW_INFO(FUNC_ADPT_FMT" local:%u, remote:%u, rtsp:%u, %u, %u\n", FUNC_ADPT_ARG(adapter) RTW_INFO(FUNC_ADPT_FMT" local:%u, remote:%u, rtsp:%u, %u, %u\n", FUNC_ADPT_ARG(adapter)
, ntohs(st->local_port), ntohs(st->remote_port), adapter->wfd_info.rtsp_ctrlport, adapter->wfd_info.tdls_rtsp_ctrlport , ntohs(st->local_port), ntohs(st->remote_port), adapter->wfd_info.rtsp_ctrlport, adapter->wfd_info.tdls_rtsp_ctrlport
, adapter->wfd_info.peer_rtsp_ctrlport); , adapter->wfd_info.peer_rtsp_ctrlport);
if (ntohs(st->local_port) == adapter->wfd_info.rtsp_ctrlport) if (ntohs((__be16)st->local_port) == adapter->wfd_info.rtsp_ctrlport)
op_wfd_mode |= MIRACAST_SINK; op_wfd_mode |= MIRACAST_SINK;
if (ntohs(st->local_port) == adapter->wfd_info.tdls_rtsp_ctrlport) if (ntohs((__be16)st->local_port) == adapter->wfd_info.tdls_rtsp_ctrlport)
op_wfd_mode |= MIRACAST_SINK; op_wfd_mode |= MIRACAST_SINK;
if (ntohs(st->remote_port) == adapter->wfd_info.peer_rtsp_ctrlport) if (ntohs((__be16)st->remote_port) == adapter->wfd_info.peer_rtsp_ctrlport)
op_wfd_mode |= MIRACAST_SOURCE; op_wfd_mode |= MIRACAST_SOURCE;
#endif #endif
} }
@ -4194,7 +4194,7 @@ exit:
return; return;
} }
void session_tracker_chk_for_adapter(_adapter *adapter) static void session_tracker_chk_for_adapter(_adapter *adapter)
{ {
struct sta_priv *stapriv = &adapter->stapriv; struct sta_priv *stapriv = &adapter->stapriv;
struct sta_info *sta; struct sta_info *sta;
@ -4226,7 +4226,7 @@ void session_tracker_chk_for_adapter(_adapter *adapter)
#endif #endif
} }
void session_tracker_cmd_hdl(_adapter *adapter, struct st_cmd_parm *parm) static void session_tracker_cmd_hdl(_adapter *adapter, struct st_cmd_parm *parm)
{ {
u8 cmd = parm->cmd; u8 cmd = parm->cmd;
struct sta_info *sta = parm->sta; struct sta_info *sta = parm->sta;

View File

@ -51,7 +51,7 @@ ODM_GetAutoChannelSelectResult(
} }
VOID static VOID
odm_AutoChannelSelectSetting( odm_AutoChannelSelectSetting(
IN PVOID pDM_VOID, IN PVOID pDM_VOID,
IN BOOLEAN IsEnable IN BOOLEAN IsEnable

View File

@ -240,7 +240,7 @@ Phydm_SetEDCCAThreshold(
} }
VOID static VOID
Phydm_SetLNA( Phydm_SetLNA(
IN PVOID pDM_VOID, IN PVOID pDM_VOID,
IN PhyDM_set_LNA type IN PhyDM_set_LNA type
@ -570,7 +570,7 @@ Phydm_SearchPwdBLowerBound(
Phydm_SetEDCCAThreshold(pDM_Odm, 0x7f, 0x7f); /*resume to no link state*/ Phydm_SetEDCCAThreshold(pDM_Odm, 0x7f, 0x7f); /*resume to no link state*/
} }
BOOLEAN static BOOLEAN
phydm_reSearchCondition( phydm_reSearchCondition(
IN PVOID pDM_VOID IN PVOID pDM_VOID
) )

View File

@ -20,7 +20,7 @@
#include "mp_precomp.h" #include "mp_precomp.h"
#include "phydm_precomp.h" #include "phydm_precomp.h"
VOID static VOID
odm_SetCrystalCap( odm_SetCrystalCap(
IN PVOID pDM_VOID, IN PVOID pDM_VOID,
IN u1Byte CrystalCap IN u1Byte CrystalCap
@ -65,7 +65,7 @@ odm_SetCrystalCap(
#endif #endif
} }
u1Byte static u1Byte
odm_GetDefaultCrytaltalCap( odm_GetDefaultCrytaltalCap(
IN PVOID pDM_VOID IN PVOID pDM_VOID
) )
@ -90,7 +90,7 @@ odm_GetDefaultCrytaltalCap(
return CrystalCap; return CrystalCap;
} }
VOID static VOID
odm_SetATCStatus( odm_SetATCStatus(
IN PVOID pDM_VOID, IN PVOID pDM_VOID,
IN BOOLEAN ATCStatus IN BOOLEAN ATCStatus
@ -106,7 +106,7 @@ odm_SetATCStatus(
pCfoTrack->bATCStatus = ATCStatus; pCfoTrack->bATCStatus = ATCStatus;
} }
BOOLEAN static BOOLEAN
odm_GetATCStatus( odm_GetATCStatus(
IN PVOID pDM_VOID IN PVOID pDM_VOID
) )

View File

@ -128,7 +128,7 @@ odm_DynamicTxPowerWritePowerIndex(
} }
VOID static VOID
odm_DynamicTxPowerNIC_CE( odm_DynamicTxPowerNIC_CE(
IN PVOID pDM_VOID IN PVOID pDM_VOID
) )

View File

@ -41,7 +41,7 @@
#if (DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_WIN)) #if (DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_WIN))
s2Byte odm_InbandNoise_Monitor_NSeries(PDM_ODM_T pDM_Odm,u8 bPauseDIG,u8 IGIValue,u32 max_time) static s2Byte odm_InbandNoise_Monitor_NSeries(PDM_ODM_T pDM_Odm,u8 bPauseDIG,u8 IGIValue,u32 max_time)
{ {
u4Byte tmp4b; u4Byte tmp4b;
u1Byte max_rf_path=0,rf_path; u1Byte max_rf_path=0,rf_path;
@ -178,7 +178,7 @@ s2Byte odm_InbandNoise_Monitor_NSeries(PDM_ODM_T pDM_Odm,u8 bPauseDIG,u8 IGIValu
} }
s2Byte static s2Byte
odm_InbandNoise_Monitor_ACSeries(PDM_ODM_T pDM_Odm, u8 bPauseDIG, u8 IGIValue, u32 max_time odm_InbandNoise_Monitor_ACSeries(PDM_ODM_T pDM_Odm, u8 bPauseDIG, u8 IGIValue, u32 max_time
) )
{ {

View File

@ -1473,7 +1473,7 @@ enum ieee80211_state {
#define IP_FMT "%d.%d.%d.%d" #define IP_FMT "%d.%d.%d.%d"
#define IP_ARG(x) ((u8 *)(x))[0], ((u8 *)(x))[1], ((u8 *)(x))[2], ((u8 *)(x))[3] #define IP_ARG(x) ((u8 *)(x))[0], ((u8 *)(x))[1], ((u8 *)(x))[2], ((u8 *)(x))[3]
#define PORT_FMT "%u" #define PORT_FMT "%u"
#define PORT_ARG(x) ntohs(*((u16 *)(x))) #define PORT_ARG(x) ntohs(*((__be16 *)(x)))
#ifdef PLATFORM_FREEBSD /* Baron change func to macro */ #ifdef PLATFORM_FREEBSD /* Baron change func to macro */
#define is_multicast_mac_addr(Addr) ((((Addr[0]) & 0x01) == 0x01) && ((Addr[0]) != 0xff)) #define is_multicast_mac_addr(Addr) ((((Addr[0]) & 0x01) == 0x01) && ((Addr[0]) != 0xff))

View File

@ -1230,7 +1230,7 @@ enum rtw_h2c_cmd {
#define _SetRFReg_CMD_ _Write_RFREG_CMD_ #define _SetRFReg_CMD_ _Write_RFREG_CMD_
#ifdef _RTW_CMD_C_ #ifdef _RTW_CMD_C_
struct _cmd_callback rtw_cmd_callback[] = { static struct _cmd_callback rtw_cmd_callback[] = {
{GEN_CMD_CODE(_Read_MACREG), &rtw_getmacreg_cmdrsp_callback}, /*0*/ {GEN_CMD_CODE(_Read_MACREG), &rtw_getmacreg_cmdrsp_callback}, /*0*/
{GEN_CMD_CODE(_Write_MACREG), NULL}, {GEN_CMD_CODE(_Write_MACREG), NULL},
{GEN_CMD_CODE(_Read_BBREG), &rtw_getbbrfreg_cmdrsp_callback}, {GEN_CMD_CODE(_Read_BBREG), &rtw_getbbrfreg_cmdrsp_callback},

View File

@ -1105,7 +1105,7 @@ u8 rtw_getmacreg_hdl(_adapter *padapter, u8 *pbuf);
#ifdef _RTW_CMD_C_ #ifdef _RTW_CMD_C_
struct cmd_hdl wlancmds[] = { static struct cmd_hdl wlancmds[] = {
GEN_DRV_CMD_HANDLER(sizeof(struct readMAC_parm), rtw_getmacreg) /*0*/ GEN_DRV_CMD_HANDLER(sizeof(struct readMAC_parm), rtw_getmacreg) /*0*/
GEN_DRV_CMD_HANDLER(0, NULL) GEN_DRV_CMD_HANDLER(0, NULL)
GEN_DRV_CMD_HANDLER(0, NULL) GEN_DRV_CMD_HANDLER(0, NULL)

View File

@ -131,9 +131,9 @@ struct stainfo_stats {
struct session_tracker { struct session_tracker {
_list list; /* session_tracker_queue */ _list list; /* session_tracker_queue */
u32 local_naddr; u32 local_naddr;
u16 local_port; __be16 local_port;
u32 remote_naddr; u32 remote_naddr;
u16 remote_port; __be16 remote_port;
u32 set_time; u32 set_time;
u8 status; u8 status;
}; };

View File

@ -88,10 +88,10 @@ module_param(rtw_usb_rxagg_mode, int, 0644);
#ifdef RTW_LOG_LEVEL #ifdef RTW_LOG_LEVEL
uint rtw_drv_log_level = (uint)RTW_LOG_LEVEL; /* from Makefile */ uint rtw_drv_log_level = (uint)RTW_LOG_LEVEL; /* from Makefile */
#else #else
uint rtw_drv_log_level = _DRV_INFO_; uint rtw_drv_log_level = _DRV_ERR_;
#endif #endif
module_param(rtw_drv_log_level, uint, 0644); module_param(rtw_drv_log_level, uint, 0644);
MODULE_PARM_DESC(rtw_drv_log_level, "set log level when insert driver module, default log level is _DRV_INFO_ = 4"); MODULE_PARM_DESC(rtw_drv_log_level, "set log level when insert driver module, default log level is _DRV_INFO_ = 2");
int rtw_radio_enable = 1; int rtw_radio_enable = 1;
int rtw_long_retry_lmt = 7; int rtw_long_retry_lmt = 7;