renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

staging: rtl8723bs: replace __inline by inline

Browse Source 
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.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Link: https://lore.kernel.org/r/20190830231527.22304-2-linux@rasmusvillemoes.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rasmus Villemoes 2019-08-31 01:15:22 +02:00 committed by Greg Kroah-Hartman
parent 39a4916b19
commit 4a39752151
10 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
View File

@ -821,12 +821,12 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t)
_set_workitem(&pwrpriv->rpwmtimeoutwi); _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; 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; pwrctrl->alives &= ~tag;
} }

2
drivers/staging/rtl8723bs/core/rtw_wlan_util.c
View File

@ -451,7 +451,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne
mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex)); 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; return pnetwork->MacAddress;
} }

6
drivers/staging/rtl8723bs/include/drv_types.h
View File

@ -478,7 +478,7 @@ struct sdio_data intf_data;
#define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv)) #define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv))
#define pwrctl_to_dvobj(pwrctl) container_of(pwrctl, struct dvobj_priv, 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 */ /* todo: get interface type from dvobj and the return the dev accordingly */
#ifdef RTW_DVOBJ_CHIP_HW_TYPE #ifdef RTW_DVOBJ_CHIP_HW_TYPE
@ -634,14 +634,14 @@ struct adapter {
/* define RTW_DISABLE_FUNC(padapter, func) (atomic_add(&adapter_to_dvobj(padapter)->disable_func, (func))) */ /* 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))) */ /* 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); int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func);
df |= func_bit; df |= func_bit;
atomic_set(&adapter_to_dvobj(padapter)->disable_func, df); 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); int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func);
df &= ~(func_bit); df &= ~(func_bit);

10
drivers/staging/rtl8723bs/include/osdep_service.h
View File

@ -110,12 +110,12 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb);
extern void _rtw_init_queue(struct __queue *pqueue); 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); allow_signal(SIGTERM);
} }
__inline static void flush_signals_thread(void) static inline void flush_signals_thread(void)
{ {
if (signal_pending (current)) if (signal_pending (current))
{ {
@ -125,7 +125,7 @@ __inline static void flush_signals_thread(void)
#define rtw_warn_on(condition) WARN_ON(condition) #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; 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 _RND(sz, r) ((((sz)+((r)-1))/(r))*(r))
#define RND4(x) (((x >> 2) + (((x & 3) == 0) ? 0: 1)) << 2) #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; 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; u32 val;

14
drivers/staging/rtl8723bs/include/osdep_service_linux.h
View File

@ -64,12 +64,12 @@
typedef struct work_struct _workitem; 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; 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)); return (&(queue->queue));
} }
@ -78,28 +78,28 @@ __inline static struct list_head *get_list_head(struct __queue *queue)
#define LIST_CONTAINOR(ptr, type, member) \ #define LIST_CONTAINOR(ptr, type, member) \
container_of(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))); 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); del_timer_sync(ptimer);
*bcancelled = true;/* true == 1; false == 0 */ *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); INIT_WORK(pwork, pfunc);
} }
__inline static void _set_workitem(_workitem *pwork) static inline void _set_workitem(_workitem *pwork)
{ {
schedule_work(pwork); schedule_work(pwork);
} }
__inline static void _cancel_workitem_sync(_workitem *pwork) static inline void _cancel_workitem_sync(_workitem *pwork)
{ {
cancel_work_sync(pwork); cancel_work_sync(pwork);
} }

14
drivers/staging/rtl8723bs/include/rtw_mlme.h
View File

@ -496,13 +496,13 @@ extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv);
extern sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, sint keyid, u8 set_tx, bool enqueue); extern sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, sint keyid, u8 set_tx, bool enqueue);
extern sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv); extern sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv);
__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) static inline u8 *get_bssid(struct mlme_priv *pmlmepriv)
{ /* if sta_mode:pmlmepriv->cur_network.network.MacAddress => bssid */ { /* if sta_mode:pmlmepriv->cur_network.network.MacAddress => bssid */
/* if adhoc_mode:pmlmepriv->cur_network.network.MacAddress => ibss mac address */ /* if adhoc_mode:pmlmepriv->cur_network.network.MacAddress => ibss mac address */
return pmlmepriv->cur_network.network.MacAddress; return pmlmepriv->cur_network.network.MacAddress;
} }
__inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) static inline sint check_fwstate(struct mlme_priv *pmlmepriv, sint state)
{ {
if (pmlmepriv->fw_state & state) if (pmlmepriv->fw_state & state)
return true; return true;
@ -510,7 +510,7 @@ __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state)
return false; return false;
} }
__inline static sint get_fwstate(struct mlme_priv *pmlmepriv) static inline sint get_fwstate(struct mlme_priv *pmlmepriv)
{ {
return pmlmepriv->fw_state; return pmlmepriv->fw_state;
} }
@ -522,7 +522,7 @@ __inline static sint get_fwstate(struct mlme_priv *pmlmepriv)
* ### NOTE:#### (!!!!) * ### NOTE:#### (!!!!)
* MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock * MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock
*/ */
__inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) static inline void set_fwstate(struct mlme_priv *pmlmepriv, sint state)
{ {
pmlmepriv->fw_state |= state; pmlmepriv->fw_state |= state;
/* FOR HW integration */ /* FOR HW integration */
@ -531,7 +531,7 @@ __inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state)
} }
} }
__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
{ {
pmlmepriv->fw_state &= ~state; pmlmepriv->fw_state &= ~state;
/* FOR HW integration */ /* FOR HW integration */
@ -544,7 +544,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
* No Limit on the calling context, * No Limit on the calling context,
* therefore set it to be the critical section... * therefore set it to be the critical section...
*/ */
__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) static inline void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
{ {
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
if (check_fwstate(pmlmepriv, state) == true) if (check_fwstate(pmlmepriv, state) == true)
@ -552,7 +552,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
spin_unlock_bh(&pmlmepriv->lock); spin_unlock_bh(&pmlmepriv->lock);
} }
__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) static inline void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val)
{ {
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
pmlmepriv->num_of_scanned = val; pmlmepriv->num_of_scanned = val;

16
drivers/staging/rtl8723bs/include/rtw_recv.h
View File

@ -405,7 +405,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);
void rtw_reordering_ctrl_timeout_handler(struct timer_list *t); void rtw_reordering_ctrl_timeout_handler(struct timer_list *t);
__inline static u8 *get_rxmem(union recv_frame *precvframe) static inline u8 *get_rxmem(union recv_frame *precvframe)
{ {
/* always return rx_head... */ /* always return rx_head... */
if (precvframe == NULL) if (precvframe == NULL)
@ -414,7 +414,7 @@ __inline static u8 *get_rxmem(union recv_frame *precvframe)
return precvframe->u.hdr.rx_head; return precvframe->u.hdr.rx_head;
} }
__inline static u8 *get_recvframe_data(union recv_frame *precvframe) static inline u8 *get_recvframe_data(union recv_frame *precvframe)
{ {
/* alwasy return rx_data */ /* alwasy return rx_data */
@ -425,7 +425,7 @@ __inline static u8 *get_recvframe_data(union recv_frame *precvframe)
} }
__inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz)
{ {
/* rx_data += sz; move rx_data sz bytes hereafter */ /* rx_data += sz; move rx_data sz bytes hereafter */
@ -450,7 +450,7 @@ __inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz)
} }
__inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz)
{ {
/* rx_tai += sz; move rx_tail sz bytes hereafter */ /* rx_tai += sz; move rx_tail sz bytes hereafter */
@ -479,7 +479,7 @@ __inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz)
__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)
{ {
/* rmv data from rx_tail (by yitsen) */ /* rmv data from rx_tail (by yitsen) */
@ -503,7 +503,7 @@ __inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)
} }
__inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem)
{ {
/* due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame */ /* due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame */
/* from any given member of recv_frame. */ /* from any given member of recv_frame. */
@ -513,13 +513,13 @@ __inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem)
} }
__inline static sint get_recvframe_len(union recv_frame *precvframe) static inline sint get_recvframe_len(union recv_frame *precvframe)
{ {
return precvframe->u.hdr.len; return precvframe->u.hdr.len;
} }
__inline static s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex)
{ {
s32 SignalPower; /* in dBm. */ s32 SignalPower; /* in dBm. */

2
drivers/staging/rtl8723bs/include/sta_info.h
View File

@ -348,7 +348,7 @@ struct sta_priv {
}; };
__inline static u32 wifi_mac_hash(u8 *mac) static inline u32 wifi_mac_hash(u8 *mac)
{ {
u32 x; u32 x;

14
drivers/staging/rtl8723bs/include/wifi.h
View File

@ -347,7 +347,7 @@ enum WIFI_REG_DOMAIN {
(addr[4] == 0xff) && (addr[5] == 0xff)) ? true : false \ (addr[4] == 0xff) && (addr[5] == 0xff)) ? true : false \
) )
__inline static int IS_MCAST(unsigned char *da) static inline int IS_MCAST(unsigned char *da)
{ {
if ((*da) & 0x01) if ((*da) & 0x01)
return true; return true;
@ -355,20 +355,20 @@ __inline static int IS_MCAST(unsigned char *da)
return false; return false;
} }
__inline static unsigned char * get_ra(unsigned char *pframe) static inline unsigned char * get_ra(unsigned char *pframe)
{ {
unsigned char *ra; unsigned char *ra;
ra = GetAddr1Ptr(pframe); ra = GetAddr1Ptr(pframe);
return ra; return ra;
} }
__inline static unsigned char * get_ta(unsigned char *pframe) static inline unsigned char * get_ta(unsigned char *pframe)
{ {
unsigned char *ta; unsigned char *ta;
ta = GetAddr2Ptr(pframe); ta = GetAddr2Ptr(pframe);
return ta; return ta;
} }
__inline static unsigned char * get_da(unsigned char *pframe) static inline unsigned char * get_da(unsigned char *pframe)
{ {
unsigned char *da; unsigned char *da;
unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe);
@ -392,7 +392,7 @@ __inline static unsigned char * get_da(unsigned char *pframe)
} }
__inline static unsigned char * get_sa(unsigned char *pframe) static inline unsigned char * get_sa(unsigned char *pframe)
{ {
unsigned char *sa; unsigned char *sa;
unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe);
@ -415,7 +415,7 @@ __inline static unsigned char * get_sa(unsigned char *pframe)
return sa; return sa;
} }
__inline static unsigned char * get_hdr_bssid(unsigned char *pframe) static inline unsigned char * get_hdr_bssid(unsigned char *pframe)
{ {
unsigned char *sa = NULL; unsigned char *sa = NULL;
unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe);
@ -439,7 +439,7 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe)
} }
__inline static int IsFrameTypeCtrl(unsigned char *pframe) static inline int IsFrameTypeCtrl(unsigned char *pframe)
{ {
if (WIFI_CTRL_TYPE == GetFrameType(pframe)) if (WIFI_CTRL_TYPE == GetFrameType(pframe))
return true; return true;

2
drivers/staging/rtl8723bs/include/wlan_bssdef.h
View File

@ -223,7 +223,7 @@ struct wlan_bssid_ex {
u8 IEs[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */ u8 IEs[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */
} __packed; } __packed;
__inline static uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
{ {
return (sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + bss->IELength); return (sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + bss->IELength);
} }