iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging:r8188eu: remove GEN_CMD_CODE macro

Browse Source 
GEN_CMD_CODE is redundant macro.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov
2016-09-30 21:36:18 +07:00
committed by Greg Kroah-Hartman
parent 2e2f78d078
commit ae7f7aa0c0
3 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/rtl8188eu/core/rtw_cmd.c
View File

@ -85,7 +85,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
/* To decide allow or not */ /* To decide allow or not */
if ((pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect) && if ((pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect) &&
(!pcmdpriv->padapter->registrypriv.usbss_enable)) { (!pcmdpriv->padapter->registrypriv.usbss_enable)) {
if (cmd_obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) { if (cmd_obj->cmdcode == _Set_Drv_Extra_CMD_) {
struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf; struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;
if (pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID) if (pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID)
@ -93,7 +93,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
} }
} }
if (cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan)) if (cmd_obj->cmdcode == _SetChannelPlan_CMD_)
bAllow = true; bAllow = true;
if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) || if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) ||
@ -271,7 +271,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n", __func__)); RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n", __func__));
init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, GEN_CMD_CODE(_SiteSurvey)); init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, _SiteSurvey_CMD_);
/* psurveyPara->bsslimit = 48; */ /* psurveyPara->bsslimit = 48; */
psurveyPara->scan_mode = pmlmepriv->scan_mode; psurveyPara->scan_mode = pmlmepriv->scan_mode;
@ -489,7 +489,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */ pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */
INIT_LIST_HEAD(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */ pcmd->cmdcode = _JoinBss_CMD_;
pcmd->parmbuf = (unsigned char *)psecnetwork; pcmd->parmbuf = (unsigned char *)psecnetwork;
pcmd->rsp = NULL; pcmd->rsp = NULL;
pcmd->rspsz = 0; pcmd->rspsz = 0;
@ -684,7 +684,7 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
paddbareq_parm->tid = tid; paddbareq_parm->tid = tid;
memcpy(paddbareq_parm->addr, addr, ETH_ALEN); memcpy(paddbareq_parm->addr, addr, ETH_ALEN);
init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq)); init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, _AddBAReq_CMD_);
/* DBG_88E("rtw_addbareq_cmd, tid =%d\n", tid); */ /* DBG_88E("rtw_addbareq_cmd, tid =%d\n", tid); */
@ -722,7 +722,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
pdrvextra_cmd_parm->type_size = 0; pdrvextra_cmd_parm->type_size = 0;
pdrvextra_cmd_parm->pbuf = (u8 *)padapter; pdrvextra_cmd_parm->pbuf = (u8 *)padapter;
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);
/* rtw_enqueue_cmd(pcmdpriv, ph2c); */ /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
@ -765,7 +765,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)
goto exit; goto exit;
} }
init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelPlan_param, GEN_CMD_CODE(_SetChannelPlan)); init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelPlan_param, _SetChannelPlan_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); res = rtw_enqueue_cmd(pcmdpriv, pcmdobj);
} else { } else {
/* no need to enqueue, do the cmd hdl directly and free cmd parameter */ /* no need to enqueue, do the cmd hdl directly and free cmd parameter */
@ -934,7 +934,7 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
pdrvextra_cmd_parm->type_size = lps_ctrl_type; pdrvextra_cmd_parm->type_size = lps_ctrl_type;
pdrvextra_cmd_parm->pbuf = NULL; pdrvextra_cmd_parm->pbuf = NULL;
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
} else { } else {
@ -976,7 +976,7 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)
pdrvextra_cmd_parm->ec_id = RTP_TIMER_CFG_WK_CID; pdrvextra_cmd_parm->ec_id = RTP_TIMER_CFG_WK_CID;
pdrvextra_cmd_parm->type_size = min_time; pdrvextra_cmd_parm->type_size = min_time;
pdrvextra_cmd_parm->pbuf = NULL; pdrvextra_cmd_parm->pbuf = NULL;
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:
@ -1018,7 +1018,7 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
pdrvextra_cmd_parm->ec_id = ANT_SELECT_WK_CID; pdrvextra_cmd_parm->ec_id = ANT_SELECT_WK_CID;
pdrvextra_cmd_parm->type_size = antenna; pdrvextra_cmd_parm->type_size = antenna;
pdrvextra_cmd_parm->pbuf = NULL; pdrvextra_cmd_parm->pbuf = NULL;
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
} else { } else {
@ -1046,7 +1046,7 @@ u8 rtw_ps_cmd(struct adapter *padapter)
pdrvextra_cmd_parm->ec_id = POWER_SAVING_CTRL_WK_CID; pdrvextra_cmd_parm->ec_id = POWER_SAVING_CTRL_WK_CID;
pdrvextra_cmd_parm->pbuf = NULL; pdrvextra_cmd_parm->pbuf = NULL;
init_h2fwcmd_w_parm_no_rsp(ppscmd, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ppscmd, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);
return rtw_enqueue_cmd(pcmdpriv, ppscmd); return rtw_enqueue_cmd(pcmdpriv, ppscmd);
} }
@ -1117,7 +1117,7 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
pdrvextra_cmd_parm->type_size = 0; pdrvextra_cmd_parm->type_size = 0;
pdrvextra_cmd_parm->pbuf = NULL; pdrvextra_cmd_parm->pbuf = NULL;
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, _Set_Drv_Extra_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit: exit:

14
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
View File

@ -4240,7 +4240,7 @@ void report_survey_event(struct adapter *padapter,
INIT_LIST_HEAD(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_;
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
pcmd_obj->parmbuf = pevtcmd; pcmd_obj->parmbuf = pevtcmd;
@ -4290,7 +4290,7 @@ void report_surveydone_event(struct adapter *padapter)
INIT_LIST_HEAD(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_;
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
pcmd_obj->parmbuf = pevtcmd; pcmd_obj->parmbuf = pevtcmd;
@ -4334,7 +4334,7 @@ void report_join_res(struct adapter *padapter, int res)
INIT_LIST_HEAD(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_;
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
pcmd_obj->parmbuf = pevtcmd; pcmd_obj->parmbuf = pevtcmd;
@ -4385,7 +4385,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
INIT_LIST_HEAD(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_;
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
pcmd_obj->parmbuf = pevtcmd; pcmd_obj->parmbuf = pevtcmd;
@ -4438,7 +4438,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
INIT_LIST_HEAD(&pcmd_obj->list); INIT_LIST_HEAD(&pcmd_obj->list);
pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT); pcmd_obj->cmdcode = _Set_MLME_EVT_CMD_;
pcmd_obj->cmdsz = cmdsz; pcmd_obj->cmdsz = cmdsz;
pcmd_obj->parmbuf = pevtcmd; pcmd_obj->parmbuf = pevtcmd;
@ -4849,7 +4849,7 @@ void survey_timer_hdl(unsigned long data)
goto exit_survey_timer_hdl; goto exit_survey_timer_hdl;
} }
init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, GEN_CMD_CODE(_SiteSurvey)); init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, _SiteSurvey_CMD_);
rtw_enqueue_cmd(pcmdpriv, ph2c); rtw_enqueue_cmd(pcmdpriv, ph2c);
} }
@ -5425,7 +5425,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
pmlmeinfo->hidden_ssid_mode); pmlmeinfo->hidden_ssid_mode);
ptxBeacon_parm->IELength += len_diff; ptxBeacon_parm->IELength += len_diff;
init_h2fwcmd_w_parm_no_rsp(ph2c, ptxBeacon_parm, GEN_CMD_CODE(_TX_Beacon)); init_h2fwcmd_w_parm_no_rsp(ph2c, ptxBeacon_parm, _TX_Beacon_CMD_);
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);

62
drivers/staging/rtl8188eu/include/rtw_cmd.h
View File

@ -284,8 +284,6 @@ struct SetChannelPlan_param {
u8 channel_plan; u8 channel_plan;
}; };
#define GEN_CMD_CODE(cmd) cmd ## _CMD_
/* /*
Result: Result:
@ -348,42 +346,42 @@ struct _cmd_callback {
}; };
enum rtw_h2c_cmd { enum rtw_h2c_cmd {
GEN_CMD_CODE(_JoinBss), _JoinBss_CMD_,
GEN_CMD_CODE(_DisConnect), _DisConnect_CMD_,
GEN_CMD_CODE(_CreateBss), _CreateBss_CMD_,
GEN_CMD_CODE(_SetOpMode), _SetOpMode_CMD_,
GEN_CMD_CODE(_SiteSurvey), _SiteSurvey_CMD_,
GEN_CMD_CODE(_SetAuth), _SetAuth_CMD_,
GEN_CMD_CODE(_SetKey), _SetKey_CMD_,
GEN_CMD_CODE(_SetStaKey), _SetStaKey_CMD_,
GEN_CMD_CODE(_SetAssocSta), _SetAssocSta_CMD_,
GEN_CMD_CODE(_AddBAReq), _AddBAReq_CMD_,
GEN_CMD_CODE(_SetChannel), _SetChannel_CMD_,
GEN_CMD_CODE(_TX_Beacon), _TX_Beacon_CMD_,
GEN_CMD_CODE(_Set_MLME_EVT), _Set_MLME_EVT_CMD_,
GEN_CMD_CODE(_Set_Drv_Extra), _Set_Drv_Extra_CMD_,
GEN_CMD_CODE(_SetChannelPlan), _SetChannelPlan_CMD_,
MAX_H2CCMD MAX_H2CCMD
}; };
#ifdef _RTW_CMD_C_ #ifdef _RTW_CMD_C_
static struct _cmd_callback rtw_cmd_callback[] = { static struct _cmd_callback rtw_cmd_callback[] = {
{GEN_CMD_CODE(_JoinBss), &rtw_joinbss_cmd_callback}, {_JoinBss_CMD_, &rtw_joinbss_cmd_callback},
{GEN_CMD_CODE(_DisConnect), &rtw_disassoc_cmd_callback}, {_DisConnect_CMD_, &rtw_disassoc_cmd_callback},
{GEN_CMD_CODE(_CreateBss), &rtw_createbss_cmd_callback}, {_CreateBss_CMD_, &rtw_createbss_cmd_callback},
{GEN_CMD_CODE(_SetOpMode), NULL}, {_SetOpMode_CMD_, NULL},
{GEN_CMD_CODE(_SiteSurvey), &rtw_survey_cmd_callback}, {_SiteSurvey_CMD_, &rtw_survey_cmd_callback},
{GEN_CMD_CODE(_SetAuth), NULL}, {_SetAuth_CMD_, NULL},
{GEN_CMD_CODE(_SetKey), NULL}, {_SetKey_CMD_, NULL},
{GEN_CMD_CODE(_SetStaKey), &rtw_setstaKey_cmdrsp_callback}, {_SetStaKey_CMD_, &rtw_setstaKey_cmdrsp_callback},
{GEN_CMD_CODE(_SetAssocSta), &rtw_setassocsta_cmdrsp_callback}, {_SetAssocSta_CMD_, &rtw_setassocsta_cmdrsp_callback},
{GEN_CMD_CODE(_AddBAReq), NULL}, {_AddBAReq_CMD_, NULL},
{GEN_CMD_CODE(_SetChannel), NULL}, {_SetChannel_CMD_, NULL},
{GEN_CMD_CODE(_TX_Beacon), NULL}, {_TX_Beacon_CMD_, NULL},
{GEN_CMD_CODE(_Set_MLME_EVT), NULL}, {_Set_MLME_EVT_CMD_, NULL},
{GEN_CMD_CODE(_Set_Drv_Extra), NULL}, {_Set_Drv_Extra_CMD_, NULL},
{GEN_CMD_CODE(_SetChannelPlan), NULL}, {_SetChannelPlan_CMD_, NULL},
}; };
#endif #endif