[patch] carl9170: remove unneeded NULL check
From: Dan Carpenter <hidden>
Date: 2012-12-02 10:42:38
Also in:
kernel-janitors
Subsystem:
atheros ath generic utilities, carl9170 linux community wireless driver, the rest · Maintainers:
Jeff Johnson, Christian Lamparter, Linus Torvalds
The "sta" variable is not checked for NULL consistently and it makes the static checkers complain. I asked Christian Lamparter about this and it turns out the check is not needed. "In fact, in order to set up a ampdu session, the stack would call the driver's op_ampdu_action callback which always needs a station." I have removed the check. Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 84377cf..23d33c3 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c@@ -1463,6 +1463,7 @@ void carl9170_op_tx(struct ieee80211_hw *hw, struct ar9170 *ar = hw->priv; struct ieee80211_tx_info *info; struct ieee80211_sta *sta = control->sta; + struct carl9170_sta_info *stai; bool run; if (unlikely(!IS_STARTED(ar)))
@@ -1479,10 +1480,8 @@ void carl9170_op_tx(struct ieee80211_hw *hw, * all ressouces which are associated with the frame. */ - if (sta) { - struct carl9170_sta_info *stai = (void *) sta->drv_priv; - atomic_inc(&stai->pending_frames); - } + stai = (void *) sta->drv_priv; + atomic_inc(&stai->pending_frames); if (info->flags & IEEE80211_TX_CTL_AMPDU) { run = carl9170_tx_ampdu_queue(ar, sta, skb);