mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging:r8188eu: remove GEN_EVT_CODE macro 

GEN_EVT_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:19 +07:00 committed by Greg Kroah-Hartman
parent ae7f7aa0c0
commit c1300df211
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4249,7 +4249,7 @@ void report_survey_event(struct adapter *padapter,
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr->len = sizeof(struct survey_event); pc2h_evt_hdr->len = sizeof(struct survey_event);
pc2h_evt_hdr->ID = GEN_EVT_CODE(_Survey); pc2h_evt_hdr->ID = _Survey_EVT_;
pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq);
psurvey_evt = (struct survey_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); psurvey_evt = (struct survey_event *)(pevtcmd + sizeof(struct C2HEvent_Header));
@ -4299,7 +4299,7 @@ void report_surveydone_event(struct adapter *padapter)
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr->len = sizeof(struct surveydone_event); pc2h_evt_hdr->len = sizeof(struct surveydone_event);
pc2h_evt_hdr->ID = GEN_EVT_CODE(_SurveyDone); pc2h_evt_hdr->ID = _SurveyDone_EVT_;
pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq);
psurveydone_evt = (struct surveydone_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); psurveydone_evt = (struct surveydone_event *)(pevtcmd + sizeof(struct C2HEvent_Header));
@ -4343,7 +4343,7 @@ void report_join_res(struct adapter *padapter, int res)
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr->len = sizeof(struct joinbss_event); pc2h_evt_hdr->len = sizeof(struct joinbss_event);
pc2h_evt_hdr->ID = GEN_EVT_CODE(_JoinBss); pc2h_evt_hdr->ID = _JoinBss_EVT_;
pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq);
pjoinbss_evt = (struct joinbss_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); pjoinbss_evt = (struct joinbss_event *)(pevtcmd + sizeof(struct C2HEvent_Header));
@ -4394,7 +4394,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr->len = sizeof(struct stadel_event); pc2h_evt_hdr->len = sizeof(struct stadel_event);
pc2h_evt_hdr->ID = GEN_EVT_CODE(_DelSTA); pc2h_evt_hdr->ID = _DelSTA_EVT_;
pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq);
pdel_sta_evt = (struct stadel_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); pdel_sta_evt = (struct stadel_event *)(pevtcmd + sizeof(struct C2HEvent_Header));
@ -4447,7 +4447,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr->len = sizeof(struct stassoc_event); pc2h_evt_hdr->len = sizeof(struct stassoc_event);
pc2h_evt_hdr->ID = GEN_EVT_CODE(_AddSTA); pc2h_evt_hdr->ID = _AddSTA_EVT_;
pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq);
padd_sta_evt = (struct stassoc_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); padd_sta_evt = (struct stassoc_event *)(pevtcmd + sizeof(struct C2HEvent_Header));

2
drivers/staging/rtl8188eu/include/rtw_event.h
View File

@ -71,8 +71,6 @@ struct stadel_event {
int mac_id; int mac_id;
}; };
#define GEN_EVT_CODE(event) event ## _EVT_
struct fwevent { struct fwevent {
u32 parmsize; u32 parmsize;
void (*event_callback)(struct adapter *dev, u8 *pbuf); void (*event_callback)(struct adapter *dev, u8 *pbuf);

50
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
View File

@ -667,32 +667,32 @@ void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf);
void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf); void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf);
enum rtw_c2h_event { enum rtw_c2h_event {
GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ _Read_MACREG_EVT_ = 0, /*0*/
GEN_EVT_CODE(_Read_BBREG), _Read_BBREG_EVT_,
GEN_EVT_CODE(_Read_RFREG), _Read_RFREG_EVT_,
GEN_EVT_CODE(_Read_EEPROM), _Read_EEPROM_EVT_,
GEN_EVT_CODE(_Read_EFUSE), _Read_EFUSE_EVT_,
GEN_EVT_CODE(_Read_CAM), /*5*/ _Read_CAM_EVT_, /*5*/
GEN_EVT_CODE(_Get_BasicRate), _Get_BasicRate_EVT_,
GEN_EVT_CODE(_Get_DataRate), _Get_DataRate_EVT_,
GEN_EVT_CODE(_Survey), /*8*/ _Survey_EVT_, /*8*/
GEN_EVT_CODE(_SurveyDone), /*9*/ _SurveyDone_EVT_, /*9*/
GEN_EVT_CODE(_JoinBss), /*10*/ _JoinBss_EVT_, /*10*/
GEN_EVT_CODE(_AddSTA), _AddSTA_EVT_,
GEN_EVT_CODE(_DelSTA), _DelSTA_EVT_,
GEN_EVT_CODE(_AtimDone), _AtimDone_EVT_,
GEN_EVT_CODE(_TX_Report), _TX_Report_EVT_,
GEN_EVT_CODE(_CCX_Report), /*15*/ _CCX_Report_EVT_, /*15*/
GEN_EVT_CODE(_DTM_Report), _DTM_Report_EVT_,
GEN_EVT_CODE(_TX_Rate_Statistics), _TX_Rate_Statistics_EVT_,
GEN_EVT_CODE(_C2HLBK), _C2HLBK_EVT_,
GEN_EVT_CODE(_FWDBG), _FWDBG_EVT_,
GEN_EVT_CODE(_C2HFEEDBACK), /*20*/ _C2HFEEDBACK_EVT_, /*20*/
GEN_EVT_CODE(_ADDBA), _ADDBA_EVT_,
GEN_EVT_CODE(_C2HBCN), _C2HBCN_EVT_,
GEN_EVT_CODE(_ReportPwrState), /* filen: only for PCIE, USB */ _ReportPwrState_EVT_, /* filen: only for PCIE, USB */
GEN_EVT_CODE(_CloseRF), /* filen: only for PCIE, _CloseRF_EVT_, /* filen: only for PCIE,
* work around ASPM */ * work around ASPM */
MAX_C2HEVT MAX_C2HEVT
}; };