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>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index baf86066e172f242d9c596d0e3f71979c7de26fa..fb13df586441b6f3cca147a5bf614a6cd314f6dd 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4249,7 +4249,7 @@ void report_survey_event(struct adapter *padapter,
 
        pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
        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);
 
        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->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);
 
        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->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);
 
        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->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);
 
        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->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);
 
        padd_sta_evt = (struct stassoc_event *)(pevtcmd + sizeof(struct C2HEvent_Header));

diff --git a/drivers/staging/rtl8188eu/include/rtw_event.h b/drivers/staging/rtl8188eu/include/rtw_event.h
index df689483644be9eefbec5f1946139278357861db..1c5ebde97091d574baf177622a0e755143ce43c2 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_event.h
+++ b/drivers/staging/rtl8188eu/include/rtw_event.h
@@ -71,8 +71,6 @@ struct stadel_event {
        int mac_id;
 };
 
-#define GEN_EVT_CODE(event)    event ## _EVT_
-
 struct fwevent {
        u32     parmsize;
        void (*event_callback)(struct adapter *dev, u8 *pbuf);

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