From e4281f385b28d716493f6666db13e61849d6f798 Mon Sep 17 00:00:00 2001 From: Quytelda Kahja Date: Mon, 19 Feb 2018 22:35:37 -0800 Subject: [PATCH] Staging: ks7010: hostif: Convert SME queue macros to real functions. Convert the unsafe macros into inline functions. Signed-off-by: Quytelda Kahja Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks_hostif.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 975dbbb..f554477f 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -21,13 +21,22 @@ /* Include Wireless Extension definition and check version */ #include /* New driver API */ -/* macro */ -#define inc_smeqhead(priv) \ - (priv->sme_i.qhead = (priv->sme_i.qhead + 1) % SME_EVENT_BUFF_SIZE) -#define inc_smeqtail(priv) \ - (priv->sme_i.qtail = (priv->sme_i.qtail + 1) % SME_EVENT_BUFF_SIZE) -#define cnt_smeqbody(priv) \ - (((priv->sme_i.qtail + SME_EVENT_BUFF_SIZE) - (priv->sme_i.qhead)) % SME_EVENT_BUFF_SIZE) +static inline void inc_smeqhead(struct ks_wlan_private *priv) +{ + priv->sme_i.qhead = (priv->sme_i.qhead + 1) % SME_EVENT_BUFF_SIZE; +} + +static inline void inc_smeqtail(struct ks_wlan_private *priv) +{ + priv->sme_i.qtail = (priv->sme_i.qtail + 1) % SME_EVENT_BUFF_SIZE; +} + +static inline unsigned int cnt_smeqbody(struct ks_wlan_private *priv) +{ + unsigned int sme_cnt = priv->sme_i.qtail - priv->sme_i.qhead; + + return (sme_cnt + SME_EVENT_BUFF_SIZE) % SME_EVENT_BUFF_SIZE; +} #define KS_WLAN_MEM_FLAG (GFP_ATOMIC) -- 2.7.4