diff options
| author | Colin Ian King <colin.king@canonical.com> | 2017-11-14 18:01:45 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-12-07 14:16:07 +0100 |
| commit | 45d9d1a12efa47ac7f7b25f9da3587e65a9511d3 (patch) | |
| tree | ee44a1204f9075f877e447c56b128826ef97a268 | |
| parent | rtlwifi: cleanup the code that check whether TX ring is available (diff) | |
| download | linux-45d9d1a12efa47ac7f7b25f9da3587e65a9511d3.tar.xz linux-45d9d1a12efa47ac7f7b25f9da3587e65a9511d3.zip | |
rtlwifi: rtl818x: remove redundant check for cck_power > 15
cck_poweri cannot be greated than 15 as is derived from the bottom 4 bits
from riv->channels[channel - 1].hw_value & 0xf. Hence the check for it
being greater than 15 is redundant and can be removed.
Detected by CoverityScan, CID#744303 ("Logically dead code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c b/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c index e6668ffb77e6..ff0971f1e2c8 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c +++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c @@ -688,10 +688,7 @@ static void rtl8225z2_b_rf_set_tx_power(struct ieee80211_hw *dev, int channel) cck_power = priv->channels[channel - 1].hw_value & 0xF; ofdm_power = priv->channels[channel - 1].hw_value >> 4; - if (cck_power > 15) - cck_power = (priv->hw_rev == RTL8187BvB) ? 15 : 22; - else - cck_power += (priv->hw_rev == RTL8187BvB) ? 0 : 7; + cck_power += (priv->hw_rev == RTL8187BvB) ? 0 : 7; cck_power += priv->txpwr_base & 0xF; cck_power = min(cck_power, (u8)35); |