Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8d8f6f2 authored by Matthias Wirth's avatar Matthias Wirth Committed by Greg Kroah-Hartman
Browse files

rtl8188eu: fix whitespace and indentation 



Signed-off-by: default avatarMatthias Wirth <matthias.wirth@gmail.com>
Signed-off-by: default avatarLukas Senger <lukas@fridolin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9340e9dc

drivers/staging/rtl8188eu/include/osdep_service.h

+29 −21
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ static inline void _exit_critical_bh(spinlock_t *plock, unsigned long *pirqL) 
	spin_unlock_bh(plock);

}



static inline int _enter_critical_mutex(struct mutex *pmutex, unsigned long *pirqL)

static inline int _enter_critical_mutex(struct mutex *pmutex,

					unsigned long *pirqL)

{

	int ret;
@@ -118,7 +119,8 @@ static inline int _enter_critical_mutex(struct mutex *pmutex, unsigned long *pir 
}





static inline void _exit_critical_mutex(struct mutex *pmutex, unsigned long *pirqL)

static inline void _exit_critical_mutex(struct mutex *pmutex,

					unsigned long *pirqL)

{

		mutex_unlock(pmutex);

}
@@ -128,7 +130,9 @@ static inline void rtw_list_delete(struct list_head *plist) 
	list_del_init(plist);

}



static inline void _init_timer(struct timer_list *ptimer,struct  net_device *nic_hdl,void *pfunc,void* cntx)

static inline void _init_timer(struct timer_list *ptimer,

			       struct  net_device *nic_hdl,

			       void *pfunc, void *cntx)

{

	ptimer->function = pfunc;

	ptimer->data = (unsigned long)cntx;
@@ -148,9 +152,11 @@ static inline void _cancel_timer(struct timer_list *ptimer,u8 *bcancelled) 


#define RTW_TIMER_HDL_ARGS void *FunctionContext

#define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl

#define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)

#define RTW_DECLARE_TIMER_HDL(name) \

	void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)



static inline void _init_workitem(struct work_struct *pwork, void *pfunc, void * cntx)

static inline void _init_workitem(struct work_struct *pwork, void *pfunc,

				  void *cntx)

{

	INIT_WORK(pwork, pfunc);

}
@@ -311,7 +317,8 @@ void _rtw_spinlock_free(spinlock_t *plock); 


void _rtw_init_queue(struct __queue *pqueue);

u32  _rtw_queue_empty(struct __queue *pqueue);

u32  rtw_end_of_queue_search(struct list_head *queue, struct list_head *pelement);

u32  rtw_end_of_queue_search(struct list_head *queue,

			     struct list_head *pelement);



u32  rtw_get_current_time(void);

u32  rtw_systime_to_ms(u32 systime);
@@ -403,7 +410,8 @@ static inline u32 bitshift(u32 bitmask) 
	u32 i;



	for (i = 0; i <= 31; i++)

		if (((bitmask>>i) &  0x1) == 1) break;

		if (((bitmask>>i) &  0x1) == 1)

			break;

	return i;

}

drivers/staging/rtl8188eu/include/rtw_cmd.h

+51 −52
Original line number Diff line number Diff line
@@ -478,8 +478,7 @@ struct getrfintfs_parm { 
	u8	rfintfs;

};



struct Tx_Beacon_param

{

struct Tx_Beacon_param {

	struct wlan_bssid_ex network;

};
@@ -715,26 +714,22 @@ struct set_ch_parm { 
};



/*H2C Handler index: 59 */

struct SetChannelPlan_param

{

struct SetChannelPlan_param {

	u8 channel_plan;

};



/*H2C Handler index: 60 */

struct LedBlink_param

{

struct LedBlink_param {

	struct LED_871x *pLed;

};



/*H2C Handler index: 61 */

struct SetChannelSwitch_param

{

struct SetChannelSwitch_param {

	u8 new_ch_no;

};



/*H2C Handler index: 62 */

struct TDLSoption_param

{

struct TDLSoption_param {

	u8 addr[ETH_ALEN];

	u8 option;

};
@@ -773,10 +768,13 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, 
			unsigned int sz);

u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch);

u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key);

u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue);

u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry,

		       u8 enqueue);

u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork);

u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueue);

u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infra networktype);

u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms,

		    bool enqueue);

u8 rtw_setopmode_cmd(struct adapter *padapter,

		     enum ndis_802_11_network_infra networktype);

u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset);

u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset);

u8 rtw_setbbreg_cmd(struct adapter *padapter, u8 offset, u8 val);
@@ -784,7 +782,8 @@ u8 rtw_setrfreg_cmd(struct adapter * padapter, u8 offset, u32 val); 
u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval);

u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval);

u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode);

u8 rtw_setrttbl_cmd(struct adapter  *padapter, struct setratable_parm *prate_table);

u8 rtw_setrttbl_cmd(struct adapter *padapter,

		    struct setratable_parm *prate_table);

u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval);



u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset, u8 *pval);
@@ -805,7 +804,8 @@ u8 rtw_ps_cmd(struct adapter*padapter); 
u8 rtw_chk_hi_queue_cmd(struct adapter *padapter);

#endif



u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue);

u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset,

		  u8 enqueue);

u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue);

u8 rtw_led_blink_cmd(struct adapter *padapter, struct LED_871x *pLed);

u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no);
@@ -913,8 +913,7 @@ enum rtw_h2c_cmd { 
#define _SetRFReg_CMD_		_Write_RFREG_CMD_



#ifdef _RTW_CMD_C_

static struct _cmd_callback	rtw_cmd_callback[] =

{

static struct _cmd_callback	rtw_cmd_callback[] = {

	{GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/

	{GEN_CMD_CODE(_Write_MACREG), NULL},

	{GEN_CMD_CODE(_Read_BBREG), &rtw_getbbrfreg_cmdrsp_callback},