Staging: rtl8188eu: checkpatch.pl error cleanups
v2 cover Staging: rtl8188eu: checkpatch.pl error cleanups
This patchset fixes all occurrences of the "space required after ','" "space required around '='" aswell as "foo * bar" related checkpatch.pl errors in rtl8188eu.
The patchset does not fix the remaining 80 character limit warnings, sinc this might require more substantial code modification.
v2: Patched against the staging-next branch as requested by Greg KH.
Tim Jester-Pfadt (2):
Staging: rtl8188eu: Fixed required spaces after ',' and around '=' and
'=='
Staging: rtl8188eu: Fixed "foo * bar" related coding style issues
drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h | 2 +- drivers/staging/rtl8188eu/include/odm.h | 2 +- drivers/staging/rtl8188eu/include/odm_debug.h | 2 +- drivers/staging/rtl8188eu/include/odm_interface.h | 2 +- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 4 ++-- drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 6 +++--- drivers/staging/rtl8188eu/include/rtw_eeprom.h | 2 +- drivers/staging/rtl8188eu/include/rtw_efuse.h | 2 +- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 4 ++-- drivers/staging/rtl8188eu/include/rtw_iol.h | 8 ++++---- drivers/staging/rtl8188eu/include/rtw_led.h | 6 +++--- drivers/staging/rtl8188eu/include/rtw_mlme.h | 8 ++++---- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 12 ++++++------ drivers/staging/rtl8188eu/include/rtw_mp.h | 10 +++++----- drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h | 2 +- drivers/staging/rtl8188eu/include/rtw_security.h | 2 +- drivers/staging/rtl8188eu/include/wifi.h | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-)
Signature · 1 line
1.8.5.2
PATCH v2 1/2 Staging: rtl8188eu: Fixed required spaces after ',' and around '=' and '=='
This patch fixes all spaces required after ',' and around '=' aswell as '==' checkpatch.pl errors for rtl8188eu.
Signed-off-by Tim Jester-Pfadt <[email protected]>
--- drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h | 2 +- drivers/staging/rtl8188eu/include/odm.h | 2 +- drivers/staging/rtl8188eu/include/odm_debug.h | 2 +- drivers/staging/rtl8188eu/include/odm_interface.h | 2 +- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 +- drivers/staging/rtl8188eu/include/rtw_eeprom.h | 2 +- drivers/staging/rtl8188eu/include/rtw_efuse.h | 2 +- drivers/staging/rtl8188eu/include/rtw_iol.h | 8 ++++---- drivers/staging/rtl8188eu/include/rtw_led.h | 2 +- drivers/staging/rtl8188eu/include/rtw_mlme.h | 6 +++--- drivers/staging/rtl8188eu/include/rtw_mp.h | 2 +- drivers/staging/rtl8188eu/include/rtw_security.h | 2 +- drivers/staging/rtl8188eu/include/wifi.h | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h +1 -1
@@ -160,7 +160,7 @@#define RTL8188E_TRANS_END \/* format */ \/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, comments here*/ \ - {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,0, PWR_CMD_END, 0, 0},/* */ + {0xFFFF, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK, 0, PWR_CMD_END, 0, 0},/* */ extern struct wl_pwr_cfg rtl8188E_power_on_flow[RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS +RTL8188E_TRANS_END_STEPS ];
drivers/staging/rtl8188eu/include/odm.h +1 -1
@@ -151,7 +151,7 @@ struct rtl_ps {int Rssi_val_min;u8 initialize; -u32 Reg874,RegC70,Reg85C,RegA74; +u32 Reg874, RegC70, Reg85C, RegA74; };
drivers/staging/rtl8188eu/include/odm_debug.h +1 -1
@@ -125,7 +125,7 @@DbgPrint (title_str); \DbgPrint (" " ); \for (__i =0 ; __i <6 ; __i++) \ -DbgPrint ("%02X%s" , __ptr[__i], (__i==5 )?"" :"-" );\ +DbgPrint ("%02X%s" , __ptr[__i], (__i ==5 )?"" :"-" );\DbgPrint ("\n" ); \ }
drivers/staging/rtl8188eu/include/odm_interface.h +1 -1
@@ -64,7 +64,7 @@ ODM_REG(DIG,_pDM_Odm)enum odm_h2c_cmd {ODM_H2C_RSSI_REPORT =0 , -ODM_H2C_PSD_RESULT =1 , +ODM_H2C_PSD_RESULT =1 , ODM_H2C_PathDiv =2 ,ODM_MAX_H2CCMD };
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +1 -1
@@ -456,7 +456,7 @@ void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail);void Hal_EfuseParseCustomerID88E (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail); -void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent, +void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent,bool AutoLoadFail);void Hal_ReadThermalMeter_88E (struct adapter * dapter,u8 *PROMContent,bool AutoloadFail);
drivers/staging/rtl8188eu/include/rtw_eeprom.h +1 -1
@@ -108,7 +108,7 @@ enum RT_CUSTOMER_ID {RT_CID_CC_C =38 , RT_CID_819x_Xavi =39 , RT_CID_819x_FUNAI_TV =40 , - RT_CID_819x_ALPHA_WD=41, + RT_CID_819x_ALPHA_WD = 41, }; struct eeprom_priv {
drivers/staging/rtl8188eu/include/rtw_efuse.h +1 -1
@@ -135,7 +135,7 @@ void EFUSE_GetEfuseDefinition(struct adapter *adapt, u8 type, u8 type1,u8 efuse_OneByteRead (struct adapter *adapter,u16 addr,u8 *data,bool test);u8 efuse_OneByteWrite (struct adapter *adapter,u16 addr,u8 data,bool test); -void Efuse_PowerSwitch (struct adapter *adapt,u8 bWrite,u8 PwrState); +void Efuse_PowerSwitch (struct adapter *adapt,u8 bWrite,u8 PwrState);int Efuse_PgPacketRead (struct adapter *adapt,u8 offset,u8 *data,bool test);int Efuse_PgPacketWrite (struct adapter *adapter,u8 offset,u8 word,u8 *data,bool test);
drivers/staging/rtl8188eu/include/rtw_iol.h +4 -4
@@ -70,15 +70,15 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr,int _rtw_IOL_append_WRF_cmd (struct xmit_frame *xmit_frame,u8 rf_path,u16 addr,u32 value,u32 mask);#define rtw_IOL_append_WB_cmd (xmit_frame, addr, value, mask) \ - _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value) ,(mask)) + _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value) , (mask))#define rtw_IOL_append_WW_cmd (xmit_frame, addr, value, mask) \ - _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value),(mask)) + _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), (mask))#define rtw_IOL_append_WD_cmd (xmit_frame, addr, value, mask) \ _rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), (mask))#define rtw_IOL_append_WRF_cmd (xmit_frame, rf_path, addr, value, mask) \ - _rtw_IOL_append_WRF_cmd((xmit_frame),(rf_path), (addr), (value), (mask)) + _rtw_IOL_append_WRF_cmd((xmit_frame), (rf_path), (addr), (value), (mask))u8 rtw_IOL_cmd_boundary_handle (struct xmit_frame *pxmit_frame); -void rtw_IOL_cmd_buf_dump (struct adapter *Adapter,int buf_len,u8 *pbuf); +void rtw_IOL_cmd_buf_dump (struct adapter *Adapter,int buf_len,u8 *pbuf);#endif /* __RTW_IOL_H_ */
drivers/staging/rtl8188eu/include/rtw_led.h +1 -1
@@ -147,7 +147,7 @@ struct LED_871x {enum LED_STRATEGY_871x {SW_LED_MODE0 =0 ,/* SW control 1 LED via GPIO0. It is default option.*/ -SW_LED_MODE1 =1 ,/* 2 LEDs, through LED0 and LED1. For ALPHA. */ +SW_LED_MODE1 =1 ,/* 2 LEDs, through LED0 and LED1. For ALPHA. */ SW_LED_MODE2 =2 ,/* SW control 1 LED via GPIO0, customized for AzWave * 8187 minicard. */ SW_LED_MODE3 =3 ,/* SW control 1 LED via GPIO0, customized for Sercomm
drivers/staging/rtl8188eu/include/rtw_mlme.h +3 -3
@@ -508,7 +508,7 @@ static inline void set_fwstate(struct mlme_priv *pmlmepriv, int state) { pmlmepriv->fw_state |= state;/* FOR HW integration */ -if (_FW_UNDER_SURVEY==state) +if (_FW_UNDER_SURVEY == state) pmlmepriv->bScanInProcess = true; }
@@ -516,7 +516,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state) { pmlmepriv->fw_state &= ~state;/* FOR HW integration */ -if (_FW_UNDER_SURVEY==state) +if (_FW_UNDER_SURVEY == state) pmlmepriv->bScanInProcess = false; }
@@ -640,6 +640,6 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst);void rtw_roaming (struct adapter *padapter,struct wlan_network *tgt_network);void _rtw_roaming (struct adapter *padapter,struct wlan_network *tgt_network); -void rtw_stassoc_hw_rpt (struct adapter *adapter,struct sta_info *psta); +void rtw_stassoc_hw_rpt (struct adapter *adapter,struct sta_info *psta);#endif /* __RTL871X_MLME_H_ */
drivers/staging/rtl8188eu/include/rtw_mp.h +1 -1
@@ -490,6 +490,6 @@ void Hal_SetCCKContinuousTx(struct adapter *pAdapter, u8 bStart);void Hal_SetOFDMContinuousTx (struct adapter *pAdapter,u8 bStart);void Hal_ProSetCrystalCap (struct adapter *pAdapter ,u32 CrystalCapVal);void _rtw_mp_xmit_priv (struct xmit_priv *pxmitpriv); -void MP_PHY_SetRFPathSwitch (struct adapter *pAdapter ,bool bMain); +void MP_PHY_SetRFPathSwitch (struct adapter *pAdapter ,bool bMain);#endif /* _RTW_MP_H_ */
drivers/staging/rtl8188eu/include/rtw_security.h +1 -1
@@ -354,7 +354,7 @@ static const unsigned long K[64] = {#define RORc (x, y) \ (((((unsigned long)(x) & 0xFFFFFFFFUL) >> (unsigned long)((y)&31)) | \ ((unsigned long)(x) << (unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL) -#define Ch (x, y ,z) (z ^ (x & (y ^ z))) +#define Ch (x, y , z) (z ^ (x & (y ^ z)))#define Maj (x, y, z) (((x | y) & z) | (x & y))#define S (x, n) RORc((x), (n))#define R (x, n) (((x)&0xFFFFFFFFUL)>>(n))
drivers/staging/rtl8188eu/include/wifi.h +1 -1
@@ -1080,7 +1080,7 @@ enum P2P_PROTO_WK_ID {P2P_PRE_TX_PROVDISC_PROCESS_WK =2 ,P2P_PRE_TX_NEGOREQ_PROCESS_WK =3 ,P2P_PRE_TX_INVITEREQ_PROCESS_WK =4 , -P2P_AP_P2P_CH_SWITCH_PROCESS_WK =5 , +P2P_AP_P2P_CH_SWITCH_PROCESS_WK =5 , P2P_RO_CH_WK = 6, };
Signature · 1 line
1.8.5.2
PATCH v2 2/2 Staging: rtl8188eu: Fixed "foo * bar" related coding style issues
In reply to Tim Jester-PfadtThis patch fixes all "foo * bar", "foo*bar", "foo* bar" checkpatch.pl errors for rtl8188eu.
Signed-off-by Tim Jester-Pfadt <[email protected]>
--- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 +- drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 6 +++--- drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 4 ++-- drivers/staging/rtl8188eu/include/rtw_led.h | 4 ++-- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 12 ++++++------ drivers/staging/rtl8188eu/include/rtw_mp.h | 8 ++++---- drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-)
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +1 -1
@@ -458,7 +458,7 @@ void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail);void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent,bool AutoLoadFail); -void Hal_ReadThermalMeter_88E (struct adapter * dapter,u8 *PROMContent, +void Hal_ReadThermalMeter_88E (struct adapter *dapter,u8 *PROMContent,bool AutoloadFail);void Hal_EfuseParseXtal_8188E (struct adapter *pAdapter,u8 *hwinfo,bool AutoLoadFail);
drivers/staging/rtl8188eu/include/rtl8188e_recv.h +3 -3
@@ -58,11 +58,11 @@ enum rx_packet_type {#define INTERRUPT_MSG_FORMAT_LEN 60void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *buf);s32 rtl8188eu_init_recv_priv (struct adapter *padapter); -void rtl8188eu_free_recv_priv (struct adapter * padapter); -void rtl8188eu_recv_hdl (struct adapter * padapter,struct recv_buf *precvbuf); +void rtl8188eu_free_recv_priv (struct adapter *padapter); +void rtl8188eu_recv_hdl (struct adapter *padapter,struct recv_buf *precvbuf);void rtl8188eu_recv_tasklet (void *priv);void rtl8188e_query_rx_phy_status (union recv_frame *fr,struct phy_stat *phy); -void rtl8188e_process_phy_info (struct adapter * padapter,void *prframe); +void rtl8188e_process_phy_info (struct adapter *padapter,void *prframe);void update_recvframe_phyinfo_88e (union recv_frame *fra,struct phy_stat *phy);void update_recvframe_attrib_88e (union recv_frame *fra,struct recv_stat *stat);
drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +2 -2
@@ -28,10 +28,10 @@ typedef u8 NDIS_802_11_PMKID_VALUE[16];u8 rtw_set_802_11_add_key (struct adapter *adapt,struct ndis_802_11_key *key);u8 rtw_set_802_11_authentication_mode (struct adapter *adapt,enum ndis_802_11_auth_mode authmode); -u8 rtw_set_802_11_bssid (struct adapter *adapter,u8 *bssid); +u8 rtw_set_802_11_bssid (struct adapter *adapter,u8 *bssid);u8 rtw_set_802_11_add_wep (struct adapter *adapter,struct ndis_802_11_wep *wep);u8 rtw_set_802_11_disassociate (struct adapter *adapter); -u8 rtw_set_802_11_bssid_list_scan (struct adapter *adapter, +u8 rtw_set_802_11_bssid_list_scan (struct adapter *adapter,struct ndis_802_11_ssid *pssid,int ssid_max_num); u8 rtw_set_802_11_infrastructure_mode(struct adapter *adapter,
drivers/staging/rtl8188eu/include/rtw_led.h +2 -2
@@ -182,7 +182,7 @@ struct led_priv{void BlinkTimerCallback (void *data);void BlinkWorkItemCallback (struct work_struct *work); -void ResetLedStatus (struct LED_871x * pLed); +void ResetLedStatus (struct LED_871x *pLed);void InitLed871x (struct adapter *padapter,struct LED_871x *pLed,enum LED_PIN_871x LedPin);
@@ -190,7 +190,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed,void DeInitLed871x (struct LED_871x *pLed);/* hal... */ -void BlinkHandler (struct LED_871x * pLed); +void BlinkHandler (struct LED_871x *pLed);void SwLedOn (struct adapter *padapter,struct LED_871x *pLed);void SwLedOff (struct adapter *padapter,struct LED_871x *pLed);
drivers/staging/rtl8188eu/include/rtw_mlme.h +1 -1
@@ -614,7 +614,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); -struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); +struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr);void _rtw_free_network_queue (struct adapter *padapter,u8 isfreeall);
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +6 -6
@@ -241,7 +241,7 @@ struct mlme_handler {struct action_handler {unsigned int num; -char * str; +char *str;unsigned int (*func)(struct adapter *adapt,union recv_frame *frame); };
@@ -484,7 +484,7 @@ void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key);void clear_cam_entry (struct adapter *padapter,u8 entry);void invalidate_cam_all (struct adapter *padapter); -void CAM_empty_entry (struct adapter * Adapter,u8 ucIndex); +void CAM_empty_entry (struct adapter *Adapter,u8 ucIndex);int allocate_fw_sta_entry (struct adapter *padapter);void flush_all_cam_entry (struct adapter *padapter);
@@ -548,11 +548,11 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_framevoid report_surveydone_event (struct adapter *padapter);void report_del_sta_event (struct adapter *padapter,unsigned char *addr,unsigned short reason); -void report_add_sta_event (struct adapter *padapter,unsigned char * addr, +void report_add_sta_event (struct adapter *padapter,unsigned char *addr,int cam_idx);void beacon_timing_control (struct adapter *padapter); -extern u8 set_tx_beacon_cmd (struct adapter *padapter); +extern u8 set_tx_beacon_cmd (struct adapter *padapter);unsigned int setup_beacon_frame (struct adapter *padapter,unsigned char *beacon_frame);void update_mgnt_tx_rate (struct adapter *padapter,u8 rate);
@@ -574,7 +574,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait_ms);void issue_p2p_invitation_response (struct adapter *padapter,u8 *raddr,u8 dialogToken,u8 success); -void issue_p2p_invitation_request (struct adapter *padapter,u8 * raddr); +void issue_p2p_invitation_request (struct adapter *padapter,u8 *raddr);#endif /* CONFIG_88EU_P2P */ void issue_beacon (struct adapter *padapter,int timeout_ms); void issue_probersp(struct adapter *padapter, unsigned char *da,
@@ -587,7 +587,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta,void issue_probereq (struct adapter *padapter,struct ndis_802_11_ssid *pssid,u8 *da);s32 issue_probereq_ex (struct adapter *adapter,struct ndis_802_11_ssid *pssid, -u8 * da,int try_cnt,int wait_ms); +u8 *da,int try_cnt,int wait_ms);int issue_nulldata (struct adapter *padapter,unsigned char *da,unsigned int power_mode,int try_cnt,int wait_ms); int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
drivers/staging/rtl8188eu/include/rtw_mp.h +4 -4
@@ -477,13 +477,13 @@ void Hal_SetChannel(struct adapter *pAdapter);void Hal_SetAntennaPathPower (struct adapter *pAdapter);s32 Hal_SetThermalMeter (struct adapter *pAdapter,u8 target_ther);s32 Hal_SetPowerTracking (struct adapter *padapter,u8 enable); -void Hal_GetPowerTracking (struct adapter *padapter,u8 * enable); +void Hal_GetPowerTracking (struct adapter *padapter,u8 *enable);void Hal_GetThermalMeter (struct adapter *pAdapter,u8 *value);void Hal_mpt_SwitchRfSetting (struct adapter *pAdapter); -void Hal_MPT_CCKTxPowerAdjust (struct adapter * Adapter,bool bInCH14); +void Hal_MPT_CCKTxPowerAdjust (struct adapter *Adapter,bool bInCH14);void Hal_MPT_CCKTxPowerAdjustbyIndex (struct adapter *pAdapter,bool beven); -void Hal_SetCCKTxPower (struct adapter *pAdapter,u8 * TxPower); -void Hal_SetOFDMTxPower (struct adapter *pAdapter,u8 * TxPower); +void Hal_SetCCKTxPower (struct adapter *pAdapter,u8 *TxPower); +void Hal_SetOFDMTxPower (struct adapter *pAdapter,u8 *TxPower);void Hal_TriggerRFThermalMeter (struct adapter *pAdapter);u8 Hal_ReadRFThermalMeter (struct adapter *pAdapter);void Hal_SetCCKContinuousTx (struct adapter *pAdapter,u8 bStart);
drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h +1 -1
@@ -278,7 +278,7 @@ struct eeprom_rw_param {struct mp_ioctl_handler {u32 paramsize; -s32 (*handler)(struct oid_par_priv * poid_par_priv); +s32 (*handler)(struct oid_par_priv *poid_par_priv);u32 oid; };
Signature · 1 line
1.8.5.2