ath9k: remove driver ASSERT, just use BUG_ON()
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
e3d01bfc3e
commit
9680e8a391
|
@ -54,8 +54,6 @@ struct ath_node;
|
||||||
|
|
||||||
#define A_MAX(a, b) ((a) > (b) ? (a) : (b))
|
#define A_MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||||
|
|
||||||
#define ASSERT(exp) BUG_ON(!(exp))
|
|
||||||
|
|
||||||
#define TSF_TO_TU(_h,_l) \
|
#define TSF_TO_TU(_h,_l) \
|
||||||
((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
|
((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
|
||||||
|
|
||||||
|
|
|
@ -3814,7 +3814,7 @@ void ath9k_hw_cfg_gpio_input(struct ath_hw *ah, u32 gpio)
|
||||||
{
|
{
|
||||||
u32 gpio_shift;
|
u32 gpio_shift;
|
||||||
|
|
||||||
ASSERT(gpio < ah->caps.num_gpio_pins);
|
BUG_ON(gpio >= ah->caps.num_gpio_pins);
|
||||||
|
|
||||||
gpio_shift = gpio << 1;
|
gpio_shift = gpio << 1;
|
||||||
|
|
||||||
|
|
|
@ -2030,7 +2030,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
|
||||||
if ((sizeof(struct ath_desc) % 4) != 0) {
|
if ((sizeof(struct ath_desc) % 4) != 0) {
|
||||||
ath_print(common, ATH_DBG_FATAL,
|
ath_print(common, ATH_DBG_FATAL,
|
||||||
"ath_desc not DWORD aligned\n");
|
"ath_desc not DWORD aligned\n");
|
||||||
ASSERT((sizeof(struct ath_desc) % 4) == 0);
|
BUG_ON((sizeof(struct ath_desc) % 4) != 0);
|
||||||
error = -ENOMEM;
|
error = -ENOMEM;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -2088,7 +2088,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
|
||||||
* descriptor fetch.
|
* descriptor fetch.
|
||||||
*/
|
*/
|
||||||
while (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr)) {
|
while (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr)) {
|
||||||
ASSERT((caddr_t) bf->bf_desc <
|
BUG_ON((caddr_t) bf->bf_desc >=
|
||||||
((caddr_t) dd->dd_desc +
|
((caddr_t) dd->dd_desc +
|
||||||
dd->dd_desc_len));
|
dd->dd_desc_len));
|
||||||
|
|
||||||
|
|
|
@ -425,7 +425,7 @@ static void ath_rc_init_valid_txmask(struct ath_rate_priv *ath_rc_priv)
|
||||||
static inline void ath_rc_set_valid_txmask(struct ath_rate_priv *ath_rc_priv,
|
static inline void ath_rc_set_valid_txmask(struct ath_rate_priv *ath_rc_priv,
|
||||||
u8 index, int valid_tx_rate)
|
u8 index, int valid_tx_rate)
|
||||||
{
|
{
|
||||||
ASSERT(index <= ath_rc_priv->rate_table_size);
|
BUG_ON(index > ath_rc_priv->rate_table_size);
|
||||||
ath_rc_priv->valid_rate_index[index] = valid_tx_rate ? 1 : 0;
|
ath_rc_priv->valid_rate_index[index] = valid_tx_rate ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1243,7 +1243,7 @@ static void ath_rc_init(struct ath_softc *sc,
|
||||||
|
|
||||||
ath_rc_priv->rate_table_size = hi + 1;
|
ath_rc_priv->rate_table_size = hi + 1;
|
||||||
ath_rc_priv->rate_max_phy = 0;
|
ath_rc_priv->rate_max_phy = 0;
|
||||||
ASSERT(ath_rc_priv->rate_table_size <= RATE_TABLE_SIZE);
|
BUG_ON(ath_rc_priv->rate_table_size > RATE_TABLE_SIZE);
|
||||||
|
|
||||||
for (i = 0, k = 0; i < WLAN_RC_PHY_MAX; i++) {
|
for (i = 0, k = 0; i < WLAN_RC_PHY_MAX; i++) {
|
||||||
for (j = 0; j < ath_rc_priv->valid_phy_ratecnt[i]; j++) {
|
for (j = 0; j < ath_rc_priv->valid_phy_ratecnt[i]; j++) {
|
||||||
|
@ -1257,8 +1257,8 @@ static void ath_rc_init(struct ath_softc *sc,
|
||||||
|
|
||||||
ath_rc_priv->rate_max_phy = ath_rc_priv->valid_phy_rateidx[i][j-1];
|
ath_rc_priv->rate_max_phy = ath_rc_priv->valid_phy_rateidx[i][j-1];
|
||||||
}
|
}
|
||||||
ASSERT(ath_rc_priv->rate_table_size <= RATE_TABLE_SIZE);
|
BUG_ON(ath_rc_priv->rate_table_size > RATE_TABLE_SIZE);
|
||||||
ASSERT(k <= RATE_TABLE_SIZE);
|
BUG_ON(k > RATE_TABLE_SIZE);
|
||||||
|
|
||||||
ath_rc_priv->max_valid_rate = k;
|
ath_rc_priv->max_valid_rate = k;
|
||||||
ath_rc_sort_validrates(rate_table, ath_rc_priv);
|
ath_rc_sort_validrates(rate_table, ath_rc_priv);
|
||||||
|
|
|
@ -59,7 +59,7 @@ static void ath_rx_buf_link(struct ath_softc *sc, struct ath_buf *bf)
|
||||||
|
|
||||||
/* virtual addr of the beginning of the buffer. */
|
/* virtual addr of the beginning of the buffer. */
|
||||||
skb = bf->bf_mpdu;
|
skb = bf->bf_mpdu;
|
||||||
ASSERT(skb != NULL);
|
BUG_ON(skb == NULL);
|
||||||
ds->ds_vdata = skb->data;
|
ds->ds_vdata = skb->data;
|
||||||
|
|
||||||
/* setup rx descriptors. The rx.bufsize here tells the harware
|
/* setup rx descriptors. The rx.bufsize here tells the harware
|
||||||
|
|
|
@ -107,7 +107,7 @@ static void ath_tx_resume_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
|
||||||
{
|
{
|
||||||
struct ath_txq *txq = &sc->tx.txq[tid->ac->qnum];
|
struct ath_txq *txq = &sc->tx.txq[tid->ac->qnum];
|
||||||
|
|
||||||
ASSERT(tid->paused > 0);
|
BUG_ON(tid->paused <= 0);
|
||||||
spin_lock_bh(&txq->axq_lock);
|
spin_lock_bh(&txq->axq_lock);
|
||||||
|
|
||||||
tid->paused--;
|
tid->paused--;
|
||||||
|
@ -131,7 +131,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
|
||||||
struct list_head bf_head;
|
struct list_head bf_head;
|
||||||
INIT_LIST_HEAD(&bf_head);
|
INIT_LIST_HEAD(&bf_head);
|
||||||
|
|
||||||
ASSERT(tid->paused > 0);
|
BUG_ON(tid->paused <= 0);
|
||||||
spin_lock_bh(&txq->axq_lock);
|
spin_lock_bh(&txq->axq_lock);
|
||||||
|
|
||||||
tid->paused--;
|
tid->paused--;
|
||||||
|
@ -143,7 +143,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
|
||||||
|
|
||||||
while (!list_empty(&tid->buf_q)) {
|
while (!list_empty(&tid->buf_q)) {
|
||||||
bf = list_first_entry(&tid->buf_q, struct ath_buf, list);
|
bf = list_first_entry(&tid->buf_q, struct ath_buf, list);
|
||||||
ASSERT(!bf_isretried(bf));
|
BUG_ON(bf_isretried(bf));
|
||||||
list_move_tail(&bf->list, &bf_head);
|
list_move_tail(&bf->list, &bf_head);
|
||||||
ath_tx_send_ht_normal(sc, txq, tid, &bf_head);
|
ath_tx_send_ht_normal(sc, txq, tid, &bf_head);
|
||||||
}
|
}
|
||||||
|
@ -178,7 +178,7 @@ static void ath_tx_addto_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
|
||||||
index = ATH_BA_INDEX(tid->seq_start, bf->bf_seqno);
|
index = ATH_BA_INDEX(tid->seq_start, bf->bf_seqno);
|
||||||
cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
|
cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
|
||||||
|
|
||||||
ASSERT(tid->tx_buf[cindex] == NULL);
|
BUG_ON(tid->tx_buf[cindex] != NULL);
|
||||||
tid->tx_buf[cindex] = bf;
|
tid->tx_buf[cindex] = bf;
|
||||||
|
|
||||||
if (index >= ((tid->baw_tail - tid->baw_head) &
|
if (index >= ((tid->baw_tail - tid->baw_head) &
|
||||||
|
@ -358,7 +358,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
|
||||||
else
|
else
|
||||||
INIT_LIST_HEAD(&bf_head);
|
INIT_LIST_HEAD(&bf_head);
|
||||||
} else {
|
} else {
|
||||||
ASSERT(!list_empty(bf_q));
|
BUG_ON(list_empty(bf_q));
|
||||||
list_move_tail(&bf->list, &bf_head);
|
list_move_tail(&bf->list, &bf_head);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -946,7 +946,7 @@ int ath_txq_update(struct ath_softc *sc, int qnum,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ASSERT(sc->tx.txq[qnum].axq_qnum == qnum);
|
BUG_ON(sc->tx.txq[qnum].axq_qnum != qnum);
|
||||||
|
|
||||||
ath9k_hw_get_txq_props(ah, qnum, &qi);
|
ath9k_hw_get_txq_props(ah, qnum, &qi);
|
||||||
qi.tqi_aifs = qinfo->tqi_aifs;
|
qi.tqi_aifs = qinfo->tqi_aifs;
|
||||||
|
|
Loading…
Reference in a new issue