On Wed, 14 Apr 2021, Fabio M. De Francesco wrote:
> Removed struct LedBlink_param. Removed LedBlink entries in
> rtw_cmd_callback[] and in wlancmds[]. Everything related to LedBlink is
> not anymore needed. Removed extra blank lines in the two mentioned
> arrays and changend the numbers set in comments for having them in line
> with the shift.
It would be better not to remove the blank lines at the same time. That
could be in another patch. It is distracting here.
julia
>
> Reported-by: Fabio Aiuto <fabioaiuto83@xxxxxxxxx>
> Reported-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Suggested-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@xxxxxxxxx>
> ---
>
> Changes from v2: Added this patch as 2/2.
> Changes from v1: No changes.
>
> drivers/staging/rtl8723bs/core/rtw_cmd.c | 27 ++++++---------------
> drivers/staging/rtl8723bs/include/rtw_cmd.h | 14 +++--------
> 2 files changed, 11 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> index f82dbd4f4c3d..a74e6846f2df 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> @@ -22,7 +22,6 @@ static struct _cmd_callback rtw_cmd_callback[] = {
> {GEN_CMD_CODE(_Write_EEPROM), NULL},
> {GEN_CMD_CODE(_Read_EFUSE), NULL},
> {GEN_CMD_CODE(_Write_EFUSE), NULL},
> -
> {GEN_CMD_CODE(_Read_CAM), NULL}, /*10*/
> {GEN_CMD_CODE(_Write_CAM), NULL},
> {GEN_CMD_CODE(_setBCNITV), NULL},
> @@ -33,7 +32,6 @@ static struct _cmd_callback rtw_cmd_callback[] = {
> {GEN_CMD_CODE(_SetOpMode), NULL},
> {GEN_CMD_CODE(_SiteSurvey), &rtw_survey_cmd_callback}, /*18*/
> {GEN_CMD_CODE(_SetAuth), NULL},
> -
> {GEN_CMD_CODE(_SetKey), NULL}, /*20*/
> {GEN_CMD_CODE(_SetStaKey), &rtw_setstaKey_cmdrsp_callback},
> {GEN_CMD_CODE(_SetAssocSta), &rtw_setassocsta_cmdrsp_callback},
> @@ -44,7 +42,6 @@ static struct _cmd_callback rtw_cmd_callback[] = {
> {GEN_CMD_CODE(_SetDataRate), NULL},
> {GEN_CMD_CODE(_GetDataRate), NULL},
> {GEN_CMD_CODE(_SetPhyInfo), NULL},
> -
> {GEN_CMD_CODE(_GetPhyInfo), NULL}, /*30*/
> {GEN_CMD_CODE(_SetPhy), NULL},
> {GEN_CMD_CODE(_GetPhy), NULL},
> @@ -55,7 +52,6 @@ static struct _cmd_callback rtw_cmd_callback[] = {
> {GEN_CMD_CODE(_JoinbssRpt), NULL},
> {GEN_CMD_CODE(_SetRaTable), NULL},
> {GEN_CMD_CODE(_GetRaTable), NULL},
> -
> {GEN_CMD_CODE(_GetCCXReport), NULL}, /*40*/
> {GEN_CMD_CODE(_GetDTMReport), NULL},
> {GEN_CMD_CODE(_GetTXRateStatistics), NULL},
> @@ -67,24 +63,19 @@ static struct _cmd_callback rtw_cmd_callback[] = {
> {GEN_CMD_CODE(_SwitchAntenna), NULL},
> {GEN_CMD_CODE(_SetCrystalCap), NULL},
> {GEN_CMD_CODE(_SetSingleCarrierTx), NULL}, /*50*/
> -
> {GEN_CMD_CODE(_SetSingleToneTx), NULL}, /*51*/
> {GEN_CMD_CODE(_SetCarrierSuppressionTx), NULL},
> {GEN_CMD_CODE(_SetContinuousTx), NULL},
> {GEN_CMD_CODE(_SwitchBandwidth), NULL}, /*54*/
> {GEN_CMD_CODE(_TX_Beacon), NULL},/*55*/
> -
> {GEN_CMD_CODE(_Set_MLME_EVT), NULL},/*56*/
> {GEN_CMD_CODE(_Set_Drv_Extra), NULL},/*57*/
> {GEN_CMD_CODE(_Set_H2C_MSG), NULL},/*58*/
> {GEN_CMD_CODE(_SetChannelPlan), NULL},/*59*/
> - {GEN_CMD_CODE(_LedBlink), NULL},/*60*/
> -
> - {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*61*/
> - {GEN_CMD_CODE(_TDLS), NULL},/*62*/
> - {GEN_CMD_CODE(_ChkBMCSleepq), NULL}, /*63*/
> -
> - {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*64*/
> + {GEN_CMD_CODE(_SetChannelSwitch), NULL},/*60*/
> + {GEN_CMD_CODE(_TDLS), NULL},/*61*/
> + {GEN_CMD_CODE(_ChkBMCSleepq), NULL}, /*62*/
> + {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*63*/
> };
>
> static struct cmd_hdl wlancmds[] = {
> @@ -144,17 +135,13 @@ static struct cmd_hdl wlancmds[] = {
> GEN_MLME_EXT_HANDLER(0, NULL)
> GEN_MLME_EXT_HANDLER(0, NULL)
> GEN_MLME_EXT_HANDLER(sizeof(struct Tx_Beacon_param), tx_beacon_hdl) /*55*/
> -
> GEN_MLME_EXT_HANDLER(0, mlme_evt_hdl) /*56*/
> GEN_MLME_EXT_HANDLER(0, rtw_drvextra_cmd_hdl) /*57*/
> -
> GEN_MLME_EXT_HANDLER(0, h2c_msg_hdl) /*58*/
> GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelPlan_param), set_chplan_hdl) /*59*/
> - GEN_MLME_EXT_HANDLER(0, NULL) /*60*/
> -
> - GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*61*/
> - GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*62*/
> - GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*63*/
> + GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param), set_csa_hdl) /*60*/
> + GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*61*/
> + GEN_MLME_EXT_HANDLER(0, chk_bmc_sleepq_hdl) /*62*/
> GEN_MLME_EXT_HANDLER(sizeof(struct RunInThread_param), run_in_thread_hdl) /*63*/
> };
>
> diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h
> index 517ae3b51386..28d2d2732374 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_cmd.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h
> @@ -537,11 +537,6 @@ struct SetChannelPlan_param {
> u8 channel_plan;
> };
>
> -/*H2C Handler index: 60 */
> -struct LedBlink_param {
> - void *pLed;
> -};
> -
> /*H2C Handler index: 61 */
> struct SetChannelSwitch_param {
> u8 new_ch_no;
> @@ -709,13 +704,12 @@ enum {
> GEN_CMD_CODE(_Set_H2C_MSG), /*58*/
>
> GEN_CMD_CODE(_SetChannelPlan), /*59*/
> - GEN_CMD_CODE(_LedBlink), /*60*/
>
> - GEN_CMD_CODE(_SetChannelSwitch), /*61*/
> - GEN_CMD_CODE(_TDLS), /*62*/
> - GEN_CMD_CODE(_ChkBMCSleepq), /*63*/
> + GEN_CMD_CODE(_SetChannelSwitch), /*60*/
> + GEN_CMD_CODE(_TDLS), /*61*/
> + GEN_CMD_CODE(_ChkBMCSleepq), /*62*/
>
> - GEN_CMD_CODE(_RunInThreadCMD), /*64*/
> + GEN_CMD_CODE(_RunInThreadCMD), /*63*/
>
> MAX_H2CCMD
> };
> --
> 2.31.1
>
>
