Commit b9887638 authored by Jiri Slaby's avatar Jiri Slaby Committed by John W. Linville
Browse files

WDEV, ath5k, don't return int from bool function 



sparse sees int -> bool cast as an error:
hw.c:3754:10: warning: cast truncates bits from constant value (ffffffea becomes 0)
Fix it by converting the rettype to int and check appropriately.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 65872e6b

drivers/net/wireless/ath5k/ath5k.h

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ struct ath5k_hw { 
		unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int,

		unsigned int, unsigned int, unsigned int, unsigned int,

		unsigned int, unsigned int, unsigned int);

	bool (*ah_setup_xtx_desc)(struct ath5k_hw *, struct ath5k_desc *,

	int (*ah_setup_xtx_desc)(struct ath5k_hw *, struct ath5k_desc *,

		unsigned int, unsigned int, unsigned int, unsigned int,

		unsigned int, unsigned int);

	int (*ah_proc_tx_desc)(struct ath5k_hw *, struct ath5k_desc *);

drivers/net/wireless/ath5k/base.c

+4 −1
Original line number Diff line number Diff line
@@ -668,7 +668,10 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) 
	 * return false w/o doing anything.  MAC's that do

	 * support it will return true w/o doing anything.

	 */

	if (ah->ah_setup_xtx_desc(ah, NULL, 0, 0, 0, 0, 0, 0))

	ret = ah->ah_setup_xtx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);

	if (ret < 0)

		goto err;

	if (ret > 0)

		__set_bit(ATH_STAT_MRRETRY, sc->status);



	/*

drivers/net/wireless/ath5k/hw.c

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *, struct ath5k_desc *, 
	unsigned int, unsigned int, enum ath5k_pkt_type, unsigned int,

	unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,

	unsigned int, unsigned int);

static bool ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *, struct ath5k_desc *,

static int ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *, struct ath5k_desc *,

	unsigned int, unsigned int, unsigned int, unsigned int, unsigned int,

	unsigned int);

static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *, struct ath5k_desc *);
@@ -3743,7 +3743,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah, 
/*

 * Initialize a 4-word multirate tx descriptor on 5212

 */

static bool

static int

ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,

	unsigned int tx_rate1, u_int tx_tries1, u_int tx_rate2, u_int tx_tries2,

	unsigned int tx_rate3, u_int tx_tries3)
@@ -3783,10 +3783,10 @@ ath5k_hw_setup_xr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc, 


#undef _XTX_TRIES



		return true;

		return 1;

	}



	return false;

	return 0;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE