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

Commit 6ca6ebc1 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: make iwl_queue_used return bool 



Also, prefer the if(!X) notation over if(X == 0).

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 686681b0

drivers/net/wireless/iwlwifi/pcie/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static inline void iwl_stop_queue(struct iwl_trans *trans, 
				    txq->q.id);

}



static inline int iwl_queue_used(const struct iwl_queue *q, int i)

static inline bool iwl_queue_used(const struct iwl_queue *q, int i)

{

	return q->write_ptr >= q->read_ptr ?

		(i >= q->read_ptr && i < q->write_ptr) :

drivers/net/wireless/iwlwifi/pcie/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn, 
	 * the last we will free. This one must be used */

	last_to_free = iwl_queue_dec_wrap(tfd_num, q->n_bd);



	if (iwl_queue_used(q, last_to_free) == 0) {

	if (!iwl_queue_used(q, last_to_free)) {

		IWL_ERR(trans,

			"%s: Read index for DMA queue txq id (%d), last_to_free %d is out of range [0-%d] %d %d.\n",

			__func__, txq_id, last_to_free, q->n_bd,
@@ -969,7 +969,7 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx) 


	lockdep_assert_held(&txq->lock);



	if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) {

	if ((idx >= q->n_bd) || (!iwl_queue_used(q, idx))) {

		IWL_ERR(trans,

			"%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n",

			__func__, txq_id, idx, q->n_bd,