Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman
c1300df2 ae7f7aa0

+30 -32
+5 -5
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
··· 4249 4249 4250 4250 pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); 4251 4251 pc2h_evt_hdr->len = sizeof(struct survey_event); 4252 - pc2h_evt_hdr->ID = GEN_EVT_CODE(_Survey); 4252 + pc2h_evt_hdr->ID = _Survey_EVT_; 4253 4253 pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); 4254 4254 4255 4255 psurvey_evt = (struct survey_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); ··· 4299 4299 4300 4300 pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); 4301 4301 pc2h_evt_hdr->len = sizeof(struct surveydone_event); 4302 - pc2h_evt_hdr->ID = GEN_EVT_CODE(_SurveyDone); 4302 + pc2h_evt_hdr->ID = _SurveyDone_EVT_; 4303 4303 pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); 4304 4304 4305 4305 psurveydone_evt = (struct surveydone_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); ··· 4343 4343 4344 4344 pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); 4345 4345 pc2h_evt_hdr->len = sizeof(struct joinbss_event); 4346 - pc2h_evt_hdr->ID = GEN_EVT_CODE(_JoinBss); 4346 + pc2h_evt_hdr->ID = _JoinBss_EVT_; 4347 4347 pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); 4348 4348 4349 4349 pjoinbss_evt = (struct joinbss_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); ··· 4394 4394 4395 4395 pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); 4396 4396 pc2h_evt_hdr->len = sizeof(struct stadel_event); 4397 - pc2h_evt_hdr->ID = GEN_EVT_CODE(_DelSTA); 4397 + pc2h_evt_hdr->ID = _DelSTA_EVT_; 4398 4398 pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); 4399 4399 4400 4400 pdel_sta_evt = (struct stadel_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); ··· 4447 4447 4448 4448 pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd); 4449 4449 pc2h_evt_hdr->len = sizeof(struct stassoc_event); 4450 - pc2h_evt_hdr->ID = GEN_EVT_CODE(_AddSTA); 4450 + pc2h_evt_hdr->ID = _AddSTA_EVT_; 4451 4451 pc2h_evt_hdr->seq = atomic_inc_return(&pmlmeext->event_seq); 4452 4452 4453 4453 padd_sta_evt = (struct stassoc_event *)(pevtcmd + sizeof(struct C2HEvent_Header));
-2
drivers/staging/rtl8188eu/include/rtw_event.h
··· 71 71 int mac_id; 72 72 }; 73 73 74 - #define GEN_EVT_CODE(event) event ## _EVT_ 75 - 76 74 struct fwevent { 77 75 u32 parmsize; 78 76 void (*event_callback)(struct adapter *dev, u8 *pbuf);
+25 -25
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
··· 667 667 void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf); 668 668 669 669 enum rtw_c2h_event { 670 - GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ 671 - GEN_EVT_CODE(_Read_BBREG), 672 - GEN_EVT_CODE(_Read_RFREG), 673 - GEN_EVT_CODE(_Read_EEPROM), 674 - GEN_EVT_CODE(_Read_EFUSE), 675 - GEN_EVT_CODE(_Read_CAM), /*5*/ 676 - GEN_EVT_CODE(_Get_BasicRate), 677 - GEN_EVT_CODE(_Get_DataRate), 678 - GEN_EVT_CODE(_Survey), /*8*/ 679 - GEN_EVT_CODE(_SurveyDone), /*9*/ 670 + _Read_MACREG_EVT_ = 0, /*0*/ 671 + _Read_BBREG_EVT_, 672 + _Read_RFREG_EVT_, 673 + _Read_EEPROM_EVT_, 674 + _Read_EFUSE_EVT_, 675 + _Read_CAM_EVT_, /*5*/ 676 + _Get_BasicRate_EVT_, 677 + _Get_DataRate_EVT_, 678 + _Survey_EVT_, /*8*/ 679 + _SurveyDone_EVT_, /*9*/ 680 680 681 - GEN_EVT_CODE(_JoinBss), /*10*/ 682 - GEN_EVT_CODE(_AddSTA), 683 - GEN_EVT_CODE(_DelSTA), 684 - GEN_EVT_CODE(_AtimDone), 685 - GEN_EVT_CODE(_TX_Report), 686 - GEN_EVT_CODE(_CCX_Report), /*15*/ 687 - GEN_EVT_CODE(_DTM_Report), 688 - GEN_EVT_CODE(_TX_Rate_Statistics), 689 - GEN_EVT_CODE(_C2HLBK), 690 - GEN_EVT_CODE(_FWDBG), 691 - GEN_EVT_CODE(_C2HFEEDBACK), /*20*/ 692 - GEN_EVT_CODE(_ADDBA), 693 - GEN_EVT_CODE(_C2HBCN), 694 - GEN_EVT_CODE(_ReportPwrState), /* filen: only for PCIE, USB */ 695 - GEN_EVT_CODE(_CloseRF), /* filen: only for PCIE, 681 + _JoinBss_EVT_, /*10*/ 682 + _AddSTA_EVT_, 683 + _DelSTA_EVT_, 684 + _AtimDone_EVT_, 685 + _TX_Report_EVT_, 686 + _CCX_Report_EVT_, /*15*/ 687 + _DTM_Report_EVT_, 688 + _TX_Rate_Statistics_EVT_, 689 + _C2HLBK_EVT_, 690 + _FWDBG_EVT_, 691 + _C2HFEEDBACK_EVT_, /*20*/ 692 + _ADDBA_EVT_, 693 + _C2HBCN_EVT_, 694 + _ReportPwrState_EVT_, /* filen: only for PCIE, USB */ 695 + _CloseRF_EVT_, /* filen: only for PCIE, 696 696 * work around ASPM */ 697 697 MAX_C2HEVT 698 698 };