lkml.org 
[lkml]   [2016]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] staging:r8188eu: remove GEN_CMD_CODE macro
    Date
    GEN_CMD_CODE is redundant macro.

    Signed-off-by: Ivan Safonov <insafonov@gmail.com>
    ---
    drivers/staging/rtl8188eu/core/rtw_cmd.c | 24 +++++------
    drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 14 +++---
    drivers/staging/rtl8188eu/include/rtw_cmd.h | 62 +++++++++++++--------------
    3 files changed, 49 insertions(+), 51 deletions(-)

    diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
    index e87ab11..f1f4788 100644
    --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
    +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
    @@ -85,7 +85,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
    /* To decide allow or not */
    if ((pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect) &&
    (!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;

    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;

    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__));

    - 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->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 */

    INIT_LIST_HEAD(&pcmd->list);
    - pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */
    + pcmd->cmdcode = _JoinBss_CMD_;
    pcmd->parmbuf = (unsigned char *)psecnetwork;
    pcmd->rsp = NULL;
    pcmd->rspsz = 0;
    @@ -684,7 +684,7 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
    paddbareq_parm->tid = tid;
    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); */

    @@ -722,7 +722,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
    pdrvextra_cmd_parm->type_size = 0;
    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); */
    @@ -765,7 +765,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)
    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);
    } else {
    /* 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->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);
    } 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->type_size = min_time;
    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);
    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->type_size = antenna;
    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);
    } 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->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);
    }
    @@ -1117,7 +1117,7 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
    pdrvextra_cmd_parm->type_size = 0;
    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);
    exit:
    diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
    index fa8a5ca..baf8606 100644
    --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
    +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
    @@ -4240,7 +4240,7 @@ void report_survey_event(struct adapter *padapter,

    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->parmbuf = pevtcmd;

    @@ -4290,7 +4290,7 @@ void report_surveydone_event(struct adapter *padapter)

    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->parmbuf = pevtcmd;

    @@ -4334,7 +4334,7 @@ void report_join_res(struct adapter *padapter, int res)

    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->parmbuf = pevtcmd;

    @@ -4385,7 +4385,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi

    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->parmbuf = pevtcmd;

    @@ -4438,7 +4438,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int

    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->parmbuf = pevtcmd;

    @@ -4849,7 +4849,7 @@ void survey_timer_hdl(unsigned long data)
    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);
    }

    @@ -5425,7 +5425,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
    pmlmeinfo->hidden_ssid_mode);
    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);

    diff --git a/drivers/staging/rtl8188eu/include/rtw_cmd.h b/drivers/staging/rtl8188eu/include/rtw_cmd.h
    index e8e75f3..18a6530 100644
    --- a/drivers/staging/rtl8188eu/include/rtw_cmd.h
    +++ b/drivers/staging/rtl8188eu/include/rtw_cmd.h
    @@ -284,8 +284,6 @@ struct SetChannelPlan_param {
    u8 channel_plan;
    };

    -#define GEN_CMD_CODE(cmd) cmd ## _CMD_
    -
    /*

    Result:
    @@ -348,42 +346,42 @@ struct _cmd_callback {
    };

    enum rtw_h2c_cmd {
    - GEN_CMD_CODE(_JoinBss),
    - GEN_CMD_CODE(_DisConnect),
    - GEN_CMD_CODE(_CreateBss),
    - GEN_CMD_CODE(_SetOpMode),
    - GEN_CMD_CODE(_SiteSurvey),
    - GEN_CMD_CODE(_SetAuth),
    - GEN_CMD_CODE(_SetKey),
    - GEN_CMD_CODE(_SetStaKey),
    - GEN_CMD_CODE(_SetAssocSta),
    - GEN_CMD_CODE(_AddBAReq),
    - GEN_CMD_CODE(_SetChannel),
    - GEN_CMD_CODE(_TX_Beacon),
    - GEN_CMD_CODE(_Set_MLME_EVT),
    - GEN_CMD_CODE(_Set_Drv_Extra),
    - GEN_CMD_CODE(_SetChannelPlan),
    + _JoinBss_CMD_,
    + _DisConnect_CMD_,
    + _CreateBss_CMD_,
    + _SetOpMode_CMD_,
    + _SiteSurvey_CMD_,
    + _SetAuth_CMD_,
    + _SetKey_CMD_,
    + _SetStaKey_CMD_,
    + _SetAssocSta_CMD_,
    + _AddBAReq_CMD_,
    + _SetChannel_CMD_,
    + _TX_Beacon_CMD_,
    + _Set_MLME_EVT_CMD_,
    + _Set_Drv_Extra_CMD_,
    + _SetChannelPlan_CMD_,

    MAX_H2CCMD
    };

    #ifdef _RTW_CMD_C_
    static struct _cmd_callback rtw_cmd_callback[] = {
    - {GEN_CMD_CODE(_JoinBss), &rtw_joinbss_cmd_callback},
    - {GEN_CMD_CODE(_DisConnect), &rtw_disassoc_cmd_callback},
    - {GEN_CMD_CODE(_CreateBss), &rtw_createbss_cmd_callback},
    - {GEN_CMD_CODE(_SetOpMode), NULL},
    - {GEN_CMD_CODE(_SiteSurvey), &rtw_survey_cmd_callback},
    - {GEN_CMD_CODE(_SetAuth), NULL},
    - {GEN_CMD_CODE(_SetKey), NULL},
    - {GEN_CMD_CODE(_SetStaKey), &rtw_setstaKey_cmdrsp_callback},
    - {GEN_CMD_CODE(_SetAssocSta), &rtw_setassocsta_cmdrsp_callback},
    - {GEN_CMD_CODE(_AddBAReq), NULL},
    - {GEN_CMD_CODE(_SetChannel), NULL},
    - {GEN_CMD_CODE(_TX_Beacon), NULL},
    - {GEN_CMD_CODE(_Set_MLME_EVT), NULL},
    - {GEN_CMD_CODE(_Set_Drv_Extra), NULL},
    - {GEN_CMD_CODE(_SetChannelPlan), NULL},
    + {_JoinBss_CMD_, &rtw_joinbss_cmd_callback},
    + {_DisConnect_CMD_, &rtw_disassoc_cmd_callback},
    + {_CreateBss_CMD_, &rtw_createbss_cmd_callback},
    + {_SetOpMode_CMD_, NULL},
    + {_SiteSurvey_CMD_, &rtw_survey_cmd_callback},
    + {_SetAuth_CMD_, NULL},
    + {_SetKey_CMD_, NULL},
    + {_SetStaKey_CMD_, &rtw_setstaKey_cmdrsp_callback},
    + {_SetAssocSta_CMD_, &rtw_setassocsta_cmdrsp_callback},
    + {_AddBAReq_CMD_, NULL},
    + {_SetChannel_CMD_, NULL},
    + {_TX_Beacon_CMD_, NULL},
    + {_Set_MLME_EVT_CMD_, NULL},
    + {_Set_Drv_Extra_CMD_, NULL},
    + {_SetChannelPlan_CMD_, NULL},
    };
    #endif

    --
    2.7.3
    \
     
     \ /
      Last update: 2016-09-30 16:38    [W:3.516 / U:0.616 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site