staging: rtl8188eu: move another static array from .h to .c

Move the declaration of the rtw_cmd_callback array from rtw_cmd.h to
rtw_cmd.c.

The _RTW_CMD_C_ symbol is now obsolete and can be removed.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210408195601.4762-8-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2021-04-08 21:55:57 +02:00 committed by Greg Kroah-Hartman
parent 7b697f098d
commit e2794029df
2 changed files with 18 additions and 21 deletions

View File

@ -4,7 +4,6 @@
* Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
*
******************************************************************************/
#define _RTW_CMD_C_
#include <osdep_service.h>
#include <drv_types.h>
@ -30,6 +29,24 @@ static struct cmd_hdl wlancmds[] = {
{sizeof(struct SetChannelPlan_param), set_chplan_hdl}
};
static struct _cmd_callback rtw_cmd_callback[] = {
{_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},
};
/*
* Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.
* No irqsave is necessary.

View File

@ -361,24 +361,4 @@ enum rtw_h2c_cmd {
MAX_H2CCMD
};
#ifdef _RTW_CMD_C_
static struct _cmd_callback rtw_cmd_callback[] = {
{_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
#endif /* _CMD_H_ */