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

Commit 2059ebe9 authored May 04, 2018 by Sergio Paracuellos Committed by Greg Kroah-Hartman May 06, 2018

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 <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 58f8128e

drivers/staging/ks7010/ks_hostif.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2259,7 +2259,7 @@ void hostif_sme_task(unsigned long dev)
	}		}

	/* send to Station Management Entity module */		/* 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 */		/* enqueue sme event */
	if (cnt_smeqbody(priv) < (SME_EVENT_BUFF_SIZE - 1)) {		if (cnt_smeqbody(priv) < (SME_EVENT_BUFF_SIZE - 1)) {

drivers/staging/ks7010/ks_hostif.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);		int hostif_data_request(struct ks_wlan_private priv, struct sk_buff skb);
	void hostif_receive(struct ks_wlan_private priv, unsigned char p,		void hostif_receive(struct ks_wlan_private priv, unsigned char p,
	unsigned int size);		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);		int hostif_init(struct ks_wlan_private *priv);
	void hostif_exit(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,		int ks_wlan_hw_tx(struct ks_wlan_private priv, void p, unsigned long size,