On Wed, Apr 14, 2021 at 01:52:43PM +0200, Fabio M. De Francesco wrote:
> Removed the led_blink_hdl() function (declaration and definition).
> Declared dummy_function() in include/rtw_mlme_ext.h and defined it in
> core/rtw_cmd.c. Changed the second parameter of GEN_MLME_EXT_HANDLER
> macro to make use of dummy_function().
>
> Reported-by: Julia Lawall <julia.law...@inria.fr>
> Suggested-by: Dan Carpenter <dan.carpen...@oracle.com>
> Signed-off-by: Fabio M. De Francesco <fmdefrance...@gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_cmd.c | 4 +++-
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 ---------
> drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 3 ++-
> 3 files changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c
> b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> index 0297fbad7bce..7b6102a2bb2c 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> @@ -87,6 +87,8 @@ static struct _cmd_callback rtw_cmd_callback[] = {
> {GEN_CMD_CODE(_RunInThreadCMD), NULL},/*64*/
> };
>
> +u8 dummy_functioni(struct adapter *var0, u8 *var1) { return 0; }
> +
I think that this won't compile
> static struct cmd_hdl wlancmds[] = {
> GEN_DRV_CMD_HANDLER(0, NULL) /*0*/
> GEN_DRV_CMD_HANDLER(0, NULL)
> @@ -150,7 +152,7 @@ static struct cmd_hdl wlancmds[] = {
>
> 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(sizeof(struct LedBlink_param), led_blink_hdl)
> /*60*/
> + GEN_MLME_EXT_HANDLER(sizeof(struct LedBlink_param), dummy_function)
> /*60*/
>
> GEN_MLME_EXT_HANDLER(sizeof(struct SetChannelSwitch_param),
> set_csa_hdl) /*61*/
> GEN_MLME_EXT_HANDLER(sizeof(struct TDLSoption_param), tdls_hdl) /*62*/
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index 873d3792ac8e..963ea80083c8 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -6189,15 +6189,6 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned
> char *pbuf)
> return H2C_SUCCESS;
> }
>
> -u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf)
> -{
> -
> - if (!pbuf)
> - return H2C_PARAMETERS_ERROR;
> -
> - return H2C_SUCCESS;
> -}
> -
> u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf)
> {
> return H2C_REJECTED;
> diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
> b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
> index 5e6cf63956b8..57977da78eb3 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
> @@ -745,11 +745,12 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter,
> unsigned char *pbuf);
> u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf);
> u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf);
> u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf);
> -u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf);
> u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf); /*
> Kurt: Handling DFS channel switch announcement ie. */
> u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf);
> u8 run_in_thread_hdl(struct adapter *padapter, u8 *pbuf);
>
> +/* Dummy function used to fill elements of an array of function pointers */
> +u8 dummy_function(struct adapter *, u8 *);
here 'dummy_function' prototype is declared
>
> #define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl},
> #define GEN_MLME_EXT_HANDLER(size, cmd) {size, cmd},
> --
> 2.31.1
>
>
thank you,
fabio
