From: Sergio Paracuellos Date: Fri, 4 May 2018 04:16:15 +0000 (+0200) Subject: staging: ks7010: use the same parameter for 'event' in hostif_sme_enqueue X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2059ebe9bfac9ed6575ffe643ab0eebe666d1701;p=openwrt%2Fstaging%2Fblogic.git staging: ks7010: use the same parameter for 'event' in hostif_sme_enqueue Declaration of second parameter 'event' in ks_hostif .h and .c file is different using uint16_t and unsigned short respectively. Just unify both using 'u16' which is preferred instead. Signed-off-by: Sergio Paracuellos Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index ea484f2e9179..965a23d8218e 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -2259,7 +2259,7 @@ void hostif_sme_task(unsigned long dev) } /* send to Station Management Entity module */ -void hostif_sme_enqueue(struct ks_wlan_private *priv, unsigned short event) +void hostif_sme_enqueue(struct ks_wlan_private *priv, u16 event) { /* enqueue sme event */ if (cnt_smeqbody(priv) < (SME_EVENT_BUFF_SIZE - 1)) { diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index cb906f096d50..974e639560e0 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h @@ -542,7 +542,7 @@ static inline bool is_hif_conf(unsigned short event) int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb); void hostif_receive(struct ks_wlan_private *priv, unsigned char *p, unsigned int size); -void hostif_sme_enqueue(struct ks_wlan_private *priv, uint16_t event); +void hostif_sme_enqueue(struct ks_wlan_private *priv, u16 event); int hostif_init(struct ks_wlan_private *priv); void hostif_exit(struct ks_wlan_private *priv); int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,