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

Commit 8b160b18 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Miguel Ojeda
Browse files

staging: rtl8723bs: replace __inline by inline 



Currently, __inline is #defined as inline in compiler_types.h, so this
should not change functionality. It is preparation for removing said
#define.

While at it, change some "inline static" to the customary "static
inline" order.

Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarMiguel Ojeda <miguel.ojeda.sandonis@gmail.com>
parent f74c2bb9

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -830,12 +830,12 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t) 
	_set_workitem(&pwrpriv->rpwmtimeoutwi);

}



static __inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag)

static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag)

{

	pwrctrl->alives |= tag;

}



static __inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag)

static inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag)

{

	pwrctrl->alives &= ~tag;

}

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne 
	mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex));

}



__inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork)

inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork)

{

	return pnetwork->MacAddress;

}

drivers/staging/rtl8723bs/include/drv_types.h

+3 −3
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ struct sdio_data intf_data; 
#define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv))

#define pwrctl_to_dvobj(pwrctl) container_of(pwrctl, struct dvobj_priv, pwrctl_priv)



__inline static struct device *dvobj_to_dev(struct dvobj_priv *dvobj)

static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)

{

	/* todo: get interface type from dvobj and the return the dev accordingly */

#ifdef RTW_DVOBJ_CHIP_HW_TYPE
@@ -636,14 +636,14 @@ struct adapter { 


/* define RTW_DISABLE_FUNC(padapter, func) (atomic_add(&adapter_to_dvobj(padapter)->disable_func, (func))) */

/* define RTW_ENABLE_FUNC(padapter, func) (atomic_sub(&adapter_to_dvobj(padapter)->disable_func, (func))) */

__inline static void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit)

static inline void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit)

{

	int	df = atomic_read(&adapter_to_dvobj(padapter)->disable_func);

	df |= func_bit;

	atomic_set(&adapter_to_dvobj(padapter)->disable_func, df);

}



__inline static void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit)

static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit)

{

	int	df = atomic_read(&adapter_to_dvobj(padapter)->disable_func);

	df &= ~(func_bit);

drivers/staging/rtl8723bs/include/osdep_service.h

+5 −5
Original line number Diff line number Diff line
@@ -110,12 +110,12 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); 


extern void _rtw_init_queue(struct __queue	*pqueue);



static __inline void thread_enter(char *name)

static inline void thread_enter(char *name)

{

	allow_signal(SIGTERM);

}



__inline static void flush_signals_thread(void)

static inline void flush_signals_thread(void)

{

	if (signal_pending (current))

	{
@@ -125,7 +125,7 @@ __inline static void flush_signals_thread(void) 


#define rtw_warn_on(condition) WARN_ON(condition)



__inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4)

static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4)

{

	int ret = true;
@@ -136,7 +136,7 @@ __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *p 
#define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r))

#define RND4(x)	(((x >> 2) + (((x & 3) == 0) ?  0: 1)) << 2)



__inline static u32 _RND4(u32 sz)

static inline u32 _RND4(u32 sz)

{



	u32 val;
@@ -147,7 +147,7 @@ __inline static u32 _RND4(u32 sz) 


}



__inline static u32 _RND8(u32 sz)

static inline u32 _RND8(u32 sz)

{



	u32 val;

drivers/staging/rtl8723bs/include/osdep_service_linux.h

+7 −7
Original line number Diff line number Diff line
@@ -64,12 +64,12 @@ 


	typedef struct work_struct _workitem;



__inline static struct list_head *get_next(struct list_head	*list)

static inline struct list_head *get_next(struct list_head	*list)

{

	return list->next;

}



__inline static struct list_head	*get_list_head(struct __queue	*queue)

static inline struct list_head	*get_list_head(struct __queue	*queue)

{

	return (&(queue->queue));

}
@@ -78,28 +78,28 @@ __inline static struct list_head *get_list_head(struct __queue *queue) 
#define LIST_CONTAINOR(ptr, type, member) \

	container_of(ptr, type, member)



__inline static void _set_timer(_timer *ptimer, u32 delay_time)

static inline void _set_timer(_timer *ptimer, u32 delay_time)

{

	mod_timer(ptimer , (jiffies+(delay_time*HZ/1000)));

}



__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)

static inline void _cancel_timer(_timer *ptimer, u8 *bcancelled)

{

	del_timer_sync(ptimer);

	*bcancelled =  true;/* true == 1; false == 0 */

}



__inline static void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)

static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)

{

	INIT_WORK(pwork, pfunc);

}



__inline static void _set_workitem(_workitem *pwork)

static inline void _set_workitem(_workitem *pwork)

{

	schedule_work(pwork);

}



__inline static void _cancel_workitem_sync(_workitem *pwork)

static inline void _cancel_workitem_sync(_workitem *pwork)

{

	cancel_work_sync(pwork);

}