Commit b1e04ba0 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: replace IS_HIF_CONF with inline function 



This commit replaces IS_HIF_CONF macro with is_11b_rate inline
function to improve readability.

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe3002c1

drivers/staging/ks7010/ks7010_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) 
		netdev_err(priv->net_dev, " error : READ_STATUS\n");



	if (atomic_read(&priv->psstatus.confirm_wait)) {

		if (IS_HIF_CONF(event)) {

		if (is_hif_conf(event)) {

			netdev_dbg(priv->net_dev, "IS_HIF_CONF true !!\n");

			atomic_dec(&priv->psstatus.confirm_wait);

		}

drivers/staging/ks7010/ks_hostif.h

+7 −5
Original line number Diff line number Diff line
@@ -608,7 +608,6 @@ enum multicast_filter_type { 


#define NIC_MAX_MCAST_LIST 32



/* macro function */

#define HIF_EVENT_MASK 0xE800



static inline bool is_hif_ind(unsigned short event)
@@ -621,10 +620,13 @@ static inline bool is_hif_ind(unsigned short event) 
		 ((event & ~HIF_EVENT_MASK) == 0x0012)));

}



#define IS_HIF_CONF(_EVENT) ((_EVENT & HIF_EVENT_MASK) == 0xE800  && \

			     (_EVENT & ~HIF_EVENT_MASK) > 0x0000  && \

			     (_EVENT & ~HIF_EVENT_MASK) < 0x0012  && \

			     !is_hif_ind(_EVENT))

static inline bool is_hif_conf(unsigned short event)

{

	return (((event & HIF_EVENT_MASK) == HIF_EVENT_MASK) &&

		((event & ~HIF_EVENT_MASK) > 0x0000) &&

		((event & ~HIF_EVENT_MASK) < 0x0012) &&

		!is_hif_ind(event));

}



#ifdef __KERNEL__