diff options
author | Joe Perches <joe@perches.com> | 2012-02-09 06:17:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-13 00:47:40 -0500 |
commit | 23677ce3172fcb93522a1df077d21019e73ee1e3 (patch) | |
tree | 9558b9c1f24d03d612f4bae999d453ae7ec637d6 | |
parent | 1a0d6ae5795c376bae6d012fb25e8341e4c6d5f2 (diff) |
drivers/net: Remove boolean comparisons to true/false
Booleans should not be compared to true or false
but be directly tested or tested with !.
Done via cocci script:
@@
bool t;
@@
- t == true
+ t
@@
bool t;
@@
- t != true
+ !t
@@
bool t;
@@
- t == false
+ !t
@@
bool t;
@@
- t != false
+ t
Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
35 files changed, 84 insertions, 100 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index c7c7bf1e573a..67e97b709edd 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
@@ -614,8 +614,7 @@ static inline void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, | |||
614 | u32 igu_addr_ctl = IGU_REG_COMMAND_REG_CTRL; | 614 | u32 igu_addr_ctl = IGU_REG_COMMAND_REG_CTRL; |
615 | u32 igu_addr_ack = IGU_REG_CSTORM_TYPE_0_SB_CLEANUP + (idu_sb_id/32)*4; | 615 | u32 igu_addr_ack = IGU_REG_CSTORM_TYPE_0_SB_CLEANUP + (idu_sb_id/32)*4; |
616 | u32 sb_bit = 1 << (idu_sb_id%32); | 616 | u32 sb_bit = 1 << (idu_sb_id%32); |
617 | u32 func_encode = func | | 617 | u32 func_encode = func | (is_Pf ? 1 : 0) << IGU_FID_ENCODE_IS_PF_SHIFT; |
618 | ((is_Pf == true ? 1 : 0) << IGU_FID_ENCODE_IS_PF_SHIFT); | ||
619 | u32 addr_encode = IGU_CMD_E2_PROD_UPD_BASE + idu_sb_id; | 618 | u32 addr_encode = IGU_CMD_E2_PROD_UPD_BASE + idu_sb_id; |
620 | 619 | ||
621 | /* Not supported in BC mode */ | 620 | /* Not supported in BC mode */ |
diff --git a/drivers/net/ethernet/brocade/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c index 29f284f79e02..689e5e19cc0b 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_cee.c +++ b/drivers/net/ethernet/brocade/bna/bfa_cee.c | |||
@@ -203,7 +203,7 @@ bfa_nw_cee_get_attr(struct bfa_cee *cee, struct bfa_cee_attr *attr, | |||
203 | if (!bfa_nw_ioc_is_operational(cee->ioc)) | 203 | if (!bfa_nw_ioc_is_operational(cee->ioc)) |
204 | return BFA_STATUS_IOC_FAILURE; | 204 | return BFA_STATUS_IOC_FAILURE; |
205 | 205 | ||
206 | if (cee->get_attr_pending == true) | 206 | if (cee->get_attr_pending) |
207 | return BFA_STATUS_DEVBUSY; | 207 | return BFA_STATUS_DEVBUSY; |
208 | 208 | ||
209 | cee->get_attr_pending = true; | 209 | cee->get_attr_pending = true; |
@@ -272,7 +272,7 @@ bfa_cee_notify(void *arg, enum bfa_ioc_event event) | |||
272 | switch (event) { | 272 | switch (event) { |
273 | case BFA_IOC_E_DISABLED: | 273 | case BFA_IOC_E_DISABLED: |
274 | case BFA_IOC_E_FAILED: | 274 | case BFA_IOC_E_FAILED: |
275 | if (cee->get_attr_pending == true) { | 275 | if (cee->get_attr_pending) { |
276 | cee->get_attr_status = BFA_STATUS_FAILED; | 276 | cee->get_attr_status = BFA_STATUS_FAILED; |
277 | cee->get_attr_pending = false; | 277 | cee->get_attr_pending = false; |
278 | if (cee->cbfn.get_attr_cbfn) { | 278 | if (cee->cbfn.get_attr_cbfn) { |
@@ -281,7 +281,7 @@ bfa_cee_notify(void *arg, enum bfa_ioc_event event) | |||
281 | BFA_STATUS_FAILED); | 281 | BFA_STATUS_FAILED); |
282 | } | 282 | } |
283 | } | 283 | } |
284 | if (cee->get_stats_pending == true) { | 284 | if (cee->get_stats_pending) { |
285 | cee->get_stats_status = BFA_STATUS_FAILED; | 285 | cee->get_stats_status = BFA_STATUS_FAILED; |
286 | cee->get_stats_pending = false; | 286 | cee->get_stats_pending = false; |
287 | if (cee->cbfn.get_stats_cbfn) { | 287 | if (cee->cbfn.get_stats_cbfn) { |
@@ -290,7 +290,7 @@ bfa_cee_notify(void *arg, enum bfa_ioc_event event) | |||
290 | BFA_STATUS_FAILED); | 290 | BFA_STATUS_FAILED); |
291 | } | 291 | } |
292 | } | 292 | } |
293 | if (cee->reset_stats_pending == true) { | 293 | if (cee->reset_stats_pending) { |
294 | cee->reset_stats_status = BFA_STATUS_FAILED; | 294 | cee->reset_stats_status = BFA_STATUS_FAILED; |
295 | cee->reset_stats_pending = false; | 295 | cee->reset_stats_pending = false; |
296 | if (cee->cbfn.reset_stats_cbfn) { | 296 | if (cee->cbfn.reset_stats_cbfn) { |
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c index abfad275b5f3..77977d735dd7 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c | |||
@@ -692,7 +692,7 @@ static void | |||
692 | bfa_iocpf_sm_mismatch_entry(struct bfa_iocpf *iocpf) | 692 | bfa_iocpf_sm_mismatch_entry(struct bfa_iocpf *iocpf) |
693 | { | 693 | { |
694 | /* Call only the first time sm enters fwmismatch state. */ | 694 | /* Call only the first time sm enters fwmismatch state. */ |
695 | if (iocpf->fw_mismatch_notified == false) | 695 | if (!iocpf->fw_mismatch_notified) |
696 | bfa_ioc_pf_fwmismatch(iocpf->ioc); | 696 | bfa_ioc_pf_fwmismatch(iocpf->ioc); |
697 | 697 | ||
698 | iocpf->fw_mismatch_notified = true; | 698 | iocpf->fw_mismatch_notified = true; |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ee.c b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c index 2ed925f38811..eca216b9b859 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_ee.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_ee.c | |||
@@ -533,10 +533,8 @@ __le16 | |||
533 | ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index) | 533 | ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index) |
534 | { | 534 | { |
535 | 535 | ||
536 | if ((index < IXGB_EEPROM_SIZE) && | 536 | if (index < IXGB_EEPROM_SIZE && ixgb_check_and_get_eeprom_data(hw)) |
537 | (ixgb_check_and_get_eeprom_data(hw) == true)) { | 537 | return hw->eeprom[index]; |
538 | return hw->eeprom[index]; | ||
539 | } | ||
540 | 538 | ||
541 | return 0; | 539 | return 0; |
542 | } | 540 | } |
@@ -558,7 +556,7 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw, | |||
558 | 556 | ||
559 | ENTER(); | 557 | ENTER(); |
560 | 558 | ||
561 | if (ixgb_check_and_get_eeprom_data(hw) == true) { | 559 | if (ixgb_check_and_get_eeprom_data(hw)) { |
562 | for (i = 0; i < ETH_ALEN; i++) { | 560 | for (i = 0; i < ETH_ALEN; i++) { |
563 | mac_addr[i] = ee_map->mac_addr[i]; | 561 | mac_addr[i] = ee_map->mac_addr[i]; |
564 | } | 562 | } |
@@ -578,7 +576,7 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw, | |||
578 | u32 | 576 | u32 |
579 | ixgb_get_ee_pba_number(struct ixgb_hw *hw) | 577 | ixgb_get_ee_pba_number(struct ixgb_hw *hw) |
580 | { | 578 | { |
581 | if (ixgb_check_and_get_eeprom_data(hw) == true) | 579 | if (ixgb_check_and_get_eeprom_data(hw)) |
582 | return le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) | 580 | return le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) |
583 | | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16); | 581 | | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16); |
584 | 582 | ||
@@ -599,7 +597,7 @@ ixgb_get_ee_device_id(struct ixgb_hw *hw) | |||
599 | { | 597 | { |
600 | struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; | 598 | struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; |
601 | 599 | ||
602 | if (ixgb_check_and_get_eeprom_data(hw) == true) | 600 | if (ixgb_check_and_get_eeprom_data(hw)) |
603 | return le16_to_cpu(ee_map->device_id); | 601 | return le16_to_cpu(ee_map->device_id); |
604 | 602 | ||
605 | return 0; | 603 | return 0; |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c index b406c367b190..752dbe6f0f54 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | |||
@@ -617,7 +617,7 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, | |||
617 | *link_up = false; | 617 | *link_up = false; |
618 | } | 618 | } |
619 | 619 | ||
620 | if (*link_up == false) | 620 | if (!*link_up) |
621 | goto out; | 621 | goto out; |
622 | } | 622 | } |
623 | 623 | ||
@@ -645,7 +645,7 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, | |||
645 | else | 645 | else |
646 | *speed = IXGBE_LINK_SPEED_1GB_FULL; | 646 | *speed = IXGBE_LINK_SPEED_1GB_FULL; |
647 | 647 | ||
648 | if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) && | 648 | if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && *link_up && |
649 | (ixgbe_validate_link_ready(hw) != 0)) | 649 | (ixgbe_validate_link_ready(hw) != 0)) |
650 | *link_up = false; | 650 | *link_up = false; |
651 | 651 | ||
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index b01ecb4d2bb1..88a58cb08569 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | |||
@@ -258,7 +258,7 @@ static void ixgbe_restore_vf_macvlans(struct ixgbe_adapter *adapter) | |||
258 | 258 | ||
259 | list_for_each(pos, &adapter->vf_mvs.l) { | 259 | list_for_each(pos, &adapter->vf_mvs.l) { |
260 | entry = list_entry(pos, struct vf_macvlans, l); | 260 | entry = list_entry(pos, struct vf_macvlans, l); |
261 | if (entry->free == false) | 261 | if (!entry->free) |
262 | hw->mac.ops.set_rar(hw, entry->rar_entry, | 262 | hw->mac.ops.set_rar(hw, entry->rar_entry, |
263 | entry->vf_macvlan, | 263 | entry->vf_macvlan, |
264 | entry->vf, IXGBE_RAH_AV); | 264 | entry->vf, IXGBE_RAH_AV); |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c index f838a2be8cfb..5e9f05fa0134 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | |||
@@ -760,7 +760,7 @@ static s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index) | |||
760 | * This will be reversed when we stop the blinking. | 760 | * This will be reversed when we stop the blinking. |
761 | */ | 761 | */ |
762 | hw->mac.ops.check_link(hw, &speed, &link_up, false); | 762 | hw->mac.ops.check_link(hw, &speed, &link_up, false); |
763 | if (link_up == false) { | 763 | if (!link_up) { |
764 | macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC); | 764 | macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC); |
765 | macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS; | 765 | macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS; |
766 | IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg); | 766 | IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg); |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index bdbec7e04a4c..69a66545c8ae 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | |||
@@ -1224,7 +1224,7 @@ static irqreturn_t pch_gbe_intr(int irq, void *data) | |||
1224 | 1224 | ||
1225 | /* When request status is Receive interruption */ | 1225 | /* When request status is Receive interruption */ |
1226 | if ((int_st & (PCH_GBE_INT_RX_DMA_CMPLT | PCH_GBE_INT_TX_CMPLT)) || | 1226 | if ((int_st & (PCH_GBE_INT_RX_DMA_CMPLT | PCH_GBE_INT_TX_CMPLT)) || |
1227 | (adapter->rx_stop_flag == true)) { | 1227 | (adapter->rx_stop_flag)) { |
1228 | if (likely(napi_schedule_prep(&adapter->napi))) { | 1228 | if (likely(napi_schedule_prep(&adapter->napi))) { |
1229 | /* Enable only Rx Descriptor empty */ | 1229 | /* Enable only Rx Descriptor empty */ |
1230 | atomic_inc(&adapter->irq_sem); | 1230 | atomic_inc(&adapter->irq_sem); |
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index e8be47d6d7d0..60338ff63092 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c | |||
@@ -355,8 +355,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) | |||
355 | } | 355 | } |
356 | } | 356 | } |
357 | 357 | ||
358 | if (clk125en == false || | 358 | if (!clk125en || (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE)) |
359 | (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE)) | ||
360 | val &= ~BCM54XX_SHD_SCR3_DLLAPD_DIS; | 359 | val &= ~BCM54XX_SHD_SCR3_DLLAPD_DIS; |
361 | else | 360 | else |
362 | val |= BCM54XX_SHD_SCR3_DLLAPD_DIS; | 361 | val |= BCM54XX_SHD_SCR3_DLLAPD_DIS; |
@@ -373,8 +372,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) | |||
373 | 372 | ||
374 | orig = val; | 373 | orig = val; |
375 | 374 | ||
376 | if (clk125en == false || | 375 | if (!clk125en || (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE)) |
377 | (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE)) | ||
378 | val |= BCM54XX_SHD_APD_EN; | 376 | val |= BCM54XX_SHD_APD_EN; |
379 | else | 377 | else |
380 | val &= ~BCM54XX_SHD_APD_EN; | 378 | val &= ~BCM54XX_SHD_APD_EN; |
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c index bf674161a217..35e93704c4ef 100644 --- a/drivers/net/wireless/ath/ath5k/ani.c +++ b/drivers/net/wireless/ath/ath5k/ani.c | |||
@@ -257,7 +257,7 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as, | |||
257 | "beacon RSSI high"); | 257 | "beacon RSSI high"); |
258 | /* only OFDM: beacon RSSI is high, we can disable ODFM weak | 258 | /* only OFDM: beacon RSSI is high, we can disable ODFM weak |
259 | * signal detection */ | 259 | * signal detection */ |
260 | if (ofdm_trigger && as->ofdm_weak_sig == true) { | 260 | if (ofdm_trigger && as->ofdm_weak_sig) { |
261 | ath5k_ani_set_ofdm_weak_signal_detection(ah, false); | 261 | ath5k_ani_set_ofdm_weak_signal_detection(ah, false); |
262 | ath5k_ani_set_spur_immunity_level(ah, 0); | 262 | ath5k_ani_set_spur_immunity_level(ah, 0); |
263 | return; | 263 | return; |
@@ -272,7 +272,7 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as, | |||
272 | * but can raise firstep level */ | 272 | * but can raise firstep level */ |
273 | ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, | 273 | ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, |
274 | "beacon RSSI mid"); | 274 | "beacon RSSI mid"); |
275 | if (ofdm_trigger && as->ofdm_weak_sig == false) | 275 | if (ofdm_trigger && !as->ofdm_weak_sig) |
276 | ath5k_ani_set_ofdm_weak_signal_detection(ah, true); | 276 | ath5k_ani_set_ofdm_weak_signal_detection(ah, true); |
277 | if (as->firstep_level < ATH5K_ANI_MAX_FIRSTEP_LVL) | 277 | if (as->firstep_level < ATH5K_ANI_MAX_FIRSTEP_LVL) |
278 | ath5k_ani_set_firstep_level(ah, as->firstep_level + 1); | 278 | ath5k_ani_set_firstep_level(ah, as->firstep_level + 1); |
@@ -282,7 +282,7 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as, | |||
282 | * detect and zero firstep level to maximize CCK sensitivity */ | 282 | * detect and zero firstep level to maximize CCK sensitivity */ |
283 | ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, | 283 | ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, |
284 | "beacon RSSI low, 2GHz"); | 284 | "beacon RSSI low, 2GHz"); |
285 | if (ofdm_trigger && as->ofdm_weak_sig == true) | 285 | if (ofdm_trigger && as->ofdm_weak_sig) |
286 | ath5k_ani_set_ofdm_weak_signal_detection(ah, false); | 286 | ath5k_ani_set_ofdm_weak_signal_detection(ah, false); |
287 | if (as->firstep_level > 0) | 287 | if (as->firstep_level > 0) |
288 | ath5k_ani_set_firstep_level(ah, 0); | 288 | ath5k_ani_set_firstep_level(ah, 0); |
@@ -326,7 +326,7 @@ ath5k_ani_lower_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as) | |||
326 | } else if (rssi > ATH5K_ANI_RSSI_THR_LOW) { | 326 | } else if (rssi > ATH5K_ANI_RSSI_THR_LOW) { |
327 | /* beacon RSSI is mid-range: turn on ODFM weak signal | 327 | /* beacon RSSI is mid-range: turn on ODFM weak signal |
328 | * detection and next, lower firstep level */ | 328 | * detection and next, lower firstep level */ |
329 | if (as->ofdm_weak_sig == false) { | 329 | if (!as->ofdm_weak_sig) { |
330 | ath5k_ani_set_ofdm_weak_signal_detection(ah, | 330 | ath5k_ani_set_ofdm_weak_signal_detection(ah, |
331 | true); | 331 | true); |
332 | return; | 332 | return; |
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c index bc56f57b393b..7e0ea4e98334 100644 --- a/drivers/net/wireless/ath/ath9k/ani.c +++ b/drivers/net/wireless/ath/ath9k/ani.c | |||
@@ -407,20 +407,20 @@ static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah) | |||
407 | if (aniState->ofdmWeakSigDetectOff) { | 407 | if (aniState->ofdmWeakSigDetectOff) { |
408 | if (ath9k_hw_ani_control(ah, | 408 | if (ath9k_hw_ani_control(ah, |
409 | ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, | 409 | ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, |
410 | true) == true) | 410 | true)) |
411 | return; | 411 | return; |
412 | } | 412 | } |
413 | if (aniState->firstepLevel > 0) { | 413 | if (aniState->firstepLevel > 0) { |
414 | if (ath9k_hw_ani_control(ah, | 414 | if (ath9k_hw_ani_control(ah, |
415 | ATH9K_ANI_FIRSTEP_LEVEL, | 415 | ATH9K_ANI_FIRSTEP_LEVEL, |
416 | aniState->firstepLevel - 1) == true) | 416 | aniState->firstepLevel - 1)) |
417 | return; | 417 | return; |
418 | } | 418 | } |
419 | } else { | 419 | } else { |
420 | if (aniState->firstepLevel > 0) { | 420 | if (aniState->firstepLevel > 0) { |
421 | if (ath9k_hw_ani_control(ah, | 421 | if (ath9k_hw_ani_control(ah, |
422 | ATH9K_ANI_FIRSTEP_LEVEL, | 422 | ATH9K_ANI_FIRSTEP_LEVEL, |
423 | aniState->firstepLevel - 1) == true) | 423 | aniState->firstepLevel - 1)) |
424 | return; | 424 | return; |
425 | } | 425 | } |
426 | } | 426 | } |
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h index c4ad0b06bdbc..265bf77598a2 100644 --- a/drivers/net/wireless/ath/ath9k/hw-ops.h +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h | |||
@@ -24,7 +24,7 @@ | |||
24 | static inline void ath9k_hw_configpcipowersave(struct ath_hw *ah, | 24 | static inline void ath9k_hw_configpcipowersave(struct ath_hw *ah, |
25 | bool power_off) | 25 | bool power_off) |
26 | { | 26 | { |
27 | if (ah->aspm_enabled != true) | 27 | if (!ah->aspm_enabled) |
28 | return; | 28 | return; |
29 | 29 | ||
30 | ath9k_hw_ops(ah)->config_pci_powersave(ah, power_off); | 30 | ath9k_hw_ops(ah)->config_pci_powersave(ah, power_off); |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 87db1ee1c298..d0d13d7cf372 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1600,7 +1600,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, | |||
1600 | allow_fbs = true; | 1600 | allow_fbs = true; |
1601 | 1601 | ||
1602 | if (bChannelChange && | 1602 | if (bChannelChange && |
1603 | (ah->chip_fullsleep != true) && | 1603 | (!ah->chip_fullsleep) && |
1604 | (ah->curchan != NULL) && | 1604 | (ah->curchan != NULL) && |
1605 | (chan->channel != ah->curchan->channel) && | 1605 | (chan->channel != ah->curchan->channel) && |
1606 | (allow_fbs || | 1606 | (allow_fbs || |
@@ -2038,8 +2038,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip) | |||
2038 | if (setChip) { | 2038 | if (setChip) { |
2039 | if ((REG_READ(ah, AR_RTC_STATUS) & | 2039 | if ((REG_READ(ah, AR_RTC_STATUS) & |
2040 | AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) { | 2040 | AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) { |
2041 | if (ath9k_hw_set_reset_reg(ah, | 2041 | if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) { |
2042 | ATH9K_RESET_POWER_ON) != true) { | ||
2043 | return false; | 2042 | return false; |
2044 | } | 2043 | } |
2045 | if (!AR_SREV_9300_20_OR_LATER(ah)) | 2044 | if (!AR_SREV_9300_20_OR_LATER(ah)) |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 6e4b5e85a099..bd2d1dd5a495 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -767,7 +767,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok) | |||
767 | brcmf_dbg(INFO, "CLKCTL: turned ON\n"); | 767 | brcmf_dbg(INFO, "CLKCTL: turned ON\n"); |
768 | 768 | ||
769 | #if defined(DEBUG) | 769 | #if defined(DEBUG) |
770 | if (bus->alp_only != true) { | 770 | if (!bus->alp_only) { |
771 | if (SBSDIO_ALPONLY(clkctl)) | 771 | if (SBSDIO_ALPONLY(clkctl)) |
772 | brcmf_dbg(ERROR, "HT Clock should be on\n"); | 772 | brcmf_dbg(ERROR, "HT Clock should be on\n"); |
773 | } | 773 | } |
@@ -2059,8 +2059,7 @@ static void | |||
2059 | brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar) | 2059 | brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar) |
2060 | { | 2060 | { |
2061 | up(&bus->sdsem); | 2061 | up(&bus->sdsem); |
2062 | wait_event_interruptible_timeout(bus->ctrl_wait, | 2062 | wait_event_interruptible_timeout(bus->ctrl_wait, !*lockvar, HZ * 2); |
2063 | (*lockvar == false), HZ * 2); | ||
2064 | down(&bus->sdsem); | 2063 | down(&bus->sdsem); |
2065 | return; | 2064 | return; |
2066 | } | 2065 | } |
@@ -2647,8 +2646,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt) | |||
2647 | 2646 | ||
2648 | /* Priority based enq */ | 2647 | /* Priority based enq */ |
2649 | spin_lock_bh(&bus->txqlock); | 2648 | spin_lock_bh(&bus->txqlock); |
2650 | if (brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec) == | 2649 | if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) { |
2651 | false) { | ||
2652 | skb_pull(pkt, SDPCM_HDRLEN); | 2650 | skb_pull(pkt, SDPCM_HDRLEN); |
2653 | brcmf_txcomplete(bus->sdiodev->dev, pkt, false); | 2651 | brcmf_txcomplete(bus->sdiodev->dev, pkt, false); |
2654 | brcmu_pkt_buf_free_skb(pkt); | 2652 | brcmu_pkt_buf_free_skb(pkt); |
@@ -2935,7 +2933,7 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen) | |||
2935 | 2933 | ||
2936 | brcmf_sdbrcm_wait_for_event(bus, &bus->ctrl_frame_stat); | 2934 | brcmf_sdbrcm_wait_for_event(bus, &bus->ctrl_frame_stat); |
2937 | 2935 | ||
2938 | if (bus->ctrl_frame_stat == false) { | 2936 | if (!bus->ctrl_frame_stat) { |
2939 | brcmf_dbg(INFO, "ctrl_frame_stat == false\n"); | 2937 | brcmf_dbg(INFO, "ctrl_frame_stat == false\n"); |
2940 | ret = 0; | 2938 | ret = 0; |
2941 | } else { | 2939 | } else { |
@@ -2997,7 +2995,7 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen) | |||
2997 | rxlen, msglen); | 2995 | rxlen, msglen); |
2998 | } else if (timeleft == 0) { | 2996 | } else if (timeleft == 0) { |
2999 | brcmf_dbg(ERROR, "resumed on timeout\n"); | 2997 | brcmf_dbg(ERROR, "resumed on timeout\n"); |
3000 | } else if (pending == true) { | 2998 | } else if (pending) { |
3001 | brcmf_dbg(CTL, "cancelled\n"); | 2999 | brcmf_dbg(CTL, "cancelled\n"); |
3002 | return -ERESTARTSYS; | 3000 | return -ERESTARTSYS; |
3003 | } else { | 3001 | } else { |
@@ -3983,7 +3981,7 @@ void | |||
3983 | brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick) | 3981 | brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick) |
3984 | { | 3982 | { |
3985 | /* Totally stop the timer */ | 3983 | /* Totally stop the timer */ |
3986 | if (!wdtick && bus->wd_timer_valid == true) { | 3984 | if (!wdtick && bus->wd_timer_valid) { |
3987 | del_timer_sync(&bus->timer); | 3985 | del_timer_sync(&bus->timer); |
3988 | bus->wd_timer_valid = false; | 3986 | bus->wd_timer_valid = false; |
3989 | bus->save_ms = wdtick; | 3987 | bus->save_ms = wdtick; |
@@ -3996,7 +3994,7 @@ brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick) | |||
3996 | 3994 | ||
3997 | if (wdtick) { | 3995 | if (wdtick) { |
3998 | if (bus->save_ms != BRCMF_WD_POLL_MS) { | 3996 | if (bus->save_ms != BRCMF_WD_POLL_MS) { |
3999 | if (bus->wd_timer_valid == true) | 3997 | if (bus->wd_timer_valid) |
4000 | /* Stop timer and restart at new value */ | 3998 | /* Stop timer and restart at new value */ |
4001 | del_timer_sync(&bus->timer); | 3999 | del_timer_sync(&bus->timer); |
4002 | 4000 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index fb712cac9157..90331dd22e5d 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c | |||
@@ -3248,7 +3248,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) | |||
3248 | } | 3248 | } |
3249 | 3249 | ||
3250 | /* For old ucode, txfifo sizes needs to be modified(increased) */ | 3250 | /* For old ucode, txfifo sizes needs to be modified(increased) */ |
3251 | if (fifosz_fixup == true) | 3251 | if (fifosz_fixup) |
3252 | brcms_b_corerev_fifofixup(wlc_hw); | 3252 | brcms_b_corerev_fifofixup(wlc_hw); |
3253 | 3253 | ||
3254 | /* check txfifo allocations match between ucode and driver */ | 3254 | /* check txfifo allocations match between ucode and driver */ |
@@ -5427,7 +5427,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config) | |||
5427 | return -EINVAL; | 5427 | return -EINVAL; |
5428 | 5428 | ||
5429 | /* update configuration value */ | 5429 | /* update configuration value */ |
5430 | if (config == true) | 5430 | if (config) |
5431 | brcms_c_protection_upd(wlc, BRCMS_PROT_G_USER, gmode); | 5431 | brcms_c_protection_upd(wlc, BRCMS_PROT_G_USER, gmode); |
5432 | 5432 | ||
5433 | /* Clear rateset override */ | 5433 | /* Clear rateset override */ |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c index ec7450d2fbd6..62eedd82534d 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | |||
@@ -21464,7 +21464,7 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init) | |||
21464 | if (NREV_GE(pi->pubpi.phy_rev, 3)) { | 21464 | if (NREV_GE(pi->pubpi.phy_rev, 3)) { |
21465 | u16 v0 = 0x211, v1 = 0x222, v2 = 0x144, v3 = 0x188; | 21465 | u16 v0 = 0x211, v1 = 0x222, v2 = 0x144, v3 = 0x188; |
21466 | 21466 | ||
21467 | if (lut_init == false) | 21467 | if (!lut_init) |
21468 | return; | 21468 | return; |
21469 | 21469 | ||
21470 | if (pi->srom_fem2g.antswctrllut == 0) { | 21470 | if (pi->srom_fem2g.antswctrllut == 0) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 30814b55705e..dfc75c172475 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | |||
@@ -478,7 +478,7 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, | |||
478 | } | 478 | } |
479 | 479 | ||
480 | txq_id = trans_pcie->agg_txq[sta_id][tid]; | 480 | txq_id = trans_pcie->agg_txq[sta_id][tid]; |
481 | if (WARN_ON_ONCE(is_agg_txqid_valid(trans, txq_id) == false)) { | 481 | if (WARN_ON_ONCE(!is_agg_txqid_valid(trans, txq_id))) { |
482 | IWL_ERR(trans, | 482 | IWL_ERR(trans, |
483 | "queue number out of range: %d, must be %d to %d\n", | 483 | "queue number out of range: %d, must be %d to %d\n", |
484 | txq_id, IWLAGN_FIRST_AMPDU_QUEUE, | 484 | txq_id, IWLAGN_FIRST_AMPDU_QUEUE, |
@@ -573,7 +573,7 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int sta_id, int tid) | |||
573 | struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); | 573 | struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); |
574 | u8 txq_id = trans_pcie->agg_txq[sta_id][tid]; | 574 | u8 txq_id = trans_pcie->agg_txq[sta_id][tid]; |
575 | 575 | ||
576 | if (WARN_ON_ONCE(is_agg_txqid_valid(trans, txq_id) == false)) { | 576 | if (WARN_ON_ONCE(!is_agg_txqid_valid(trans, txq_id))) { |
577 | IWL_ERR(trans, | 577 | IWL_ERR(trans, |
578 | "queue number out of range: %d, must be %d to %d\n", | 578 | "queue number out of range: %d, must be %d to %d\n", |
579 | txq_id, IWLAGN_FIRST_AMPDU_QUEUE, | 579 | txq_id, IWLAGN_FIRST_AMPDU_QUEUE, |
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index fd125473be7a..91c5f74350b7 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -1330,7 +1330,7 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit) | |||
1330 | wh->addr1); | 1330 | wh->addr1); |
1331 | 1331 | ||
1332 | if (mwl8k_vif != NULL && | 1332 | if (mwl8k_vif != NULL && |
1333 | mwl8k_vif->is_hw_crypto_enabled == true) { | 1333 | mwl8k_vif->is_hw_crypto_enabled) { |
1334 | /* | 1334 | /* |
1335 | * When MMIC ERROR is encountered | 1335 | * When MMIC ERROR is encountered |
1336 | * by the firmware, payload is | 1336 | * by the firmware, payload is |
@@ -1993,8 +1993,7 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) | |||
1993 | */ | 1993 | */ |
1994 | 1994 | ||
1995 | if (txq->len >= MWL8K_TX_DESCS - 2) { | 1995 | if (txq->len >= MWL8K_TX_DESCS - 2) { |
1996 | if (mgmtframe == false || | 1996 | if (!mgmtframe || txq->len == MWL8K_TX_DESCS) { |
1997 | txq->len == MWL8K_TX_DESCS) { | ||
1998 | if (start_ba_session) { | 1997 | if (start_ba_session) { |
1999 | spin_lock(&priv->stream_lock); | 1998 | spin_lock(&priv->stream_lock); |
2000 | mwl8k_remove_stream(hw, stream); | 1999 | mwl8k_remove_stream(hw, stream); |
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c index b24cbe6e16d8..1f143800a8d7 100644 --- a/drivers/net/wireless/rtlwifi/efuse.c +++ b/drivers/net/wireless/rtlwifi/efuse.c | |||
@@ -777,7 +777,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr, | |||
777 | dataempty = false; | 777 | dataempty = false; |
778 | } | 778 | } |
779 | 779 | ||
780 | if (dataempty == false) { | 780 | if (!dataempty) { |
781 | *efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1; | 781 | *efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1; |
782 | *write_state = PG_STATE_HEADER; | 782 | *write_state = PG_STATE_HEADER; |
783 | } else { | 783 | } else { |
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index 15f86eaa1cd6..5b9c3b5e8c92 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
@@ -105,8 +105,7 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw, | |||
105 | 105 | ||
106 | case ERFOFF: | 106 | case ERFOFF: |
107 | 107 | ||
108 | if ((changesource == RF_CHANGE_BY_HW) | 108 | if ((changesource == RF_CHANGE_BY_HW) && !ppsc->hwradiooff) { |
109 | && (ppsc->hwradiooff == false)) { | ||
110 | ppsc->hwradiooff = true; | 109 | ppsc->hwradiooff = true; |
111 | } | 110 | } |
112 | 111 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c index cb5535cf3ae2..a64473556ea8 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | |||
@@ -329,8 +329,8 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw) | |||
329 | if (mac->opmode == NL80211_IFTYPE_ADHOC) | 329 | if (mac->opmode == NL80211_IFTYPE_ADHOC) |
330 | multi_sta = true; | 330 | multi_sta = true; |
331 | 331 | ||
332 | if ((multi_sta == false) || (dm_digtable.cursta_connectctate != | 332 | if (!multi_sta || |
333 | DIG_STA_DISCONNECT)) { | 333 | dm_digtable.cursta_connectctate != DIG_STA_DISCONNECT) { |
334 | initialized = false; | 334 | initialized = false; |
335 | dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; | 335 | dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; |
336 | return; | 336 | return; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c index 22e998dd2f32..bfff5fe8623c 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | |||
@@ -216,7 +216,7 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw) | |||
216 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n"); | 216 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n"); |
217 | rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw, | 217 | rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw, |
218 | BASEBAND_CONFIG_PHY_REG); | 218 | BASEBAND_CONFIG_PHY_REG); |
219 | if (rtstatus != true) { | 219 | if (!rtstatus) { |
220 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n"); | 220 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n"); |
221 | return false; | 221 | return false; |
222 | } | 222 | } |
@@ -229,13 +229,13 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw) | |||
229 | rtstatus = rtlpriv->cfg->ops->config_bb_with_pgheaderfile(hw, | 229 | rtstatus = rtlpriv->cfg->ops->config_bb_with_pgheaderfile(hw, |
230 | BASEBAND_CONFIG_PHY_REG); | 230 | BASEBAND_CONFIG_PHY_REG); |
231 | } | 231 | } |
232 | if (rtstatus != true) { | 232 | if (!rtstatus) { |
233 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n"); | 233 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n"); |
234 | return false; | 234 | return false; |
235 | } | 235 | } |
236 | rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw, | 236 | rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw, |
237 | BASEBAND_CONFIG_AGC_TAB); | 237 | BASEBAND_CONFIG_AGC_TAB); |
238 | if (rtstatus != true) { | 238 | if (!rtstatus) { |
239 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n"); | 239 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n"); |
240 | return false; | 240 | return false; |
241 | } | 241 | } |
@@ -580,7 +580,7 @@ void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel) | |||
580 | struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv); | 580 | struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv); |
581 | u8 cckpowerlevel[2], ofdmpowerlevel[2]; | 581 | u8 cckpowerlevel[2], ofdmpowerlevel[2]; |
582 | 582 | ||
583 | if (rtlefuse->txpwr_fromeprom == false) | 583 | if (!rtlefuse->txpwr_fromeprom) |
584 | return; | 584 | return; |
585 | _rtl92c_get_txpower_index(hw, channel, | 585 | _rtl92c_get_txpower_index(hw, channel, |
586 | &cckpowerlevel[0], &ofdmpowerlevel[0]); | 586 | &cckpowerlevel[0], &ofdmpowerlevel[0]); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 48c7b5d3fc5b..5c4d9bc040f1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -693,7 +693,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw) | |||
693 | 693 | ||
694 | rtl_write_word(rtlpriv, REG_CR, 0x2ff); | 694 | rtl_write_word(rtlpriv, REG_CR, 0x2ff); |
695 | 695 | ||
696 | if (_rtl92ce_llt_table_init(hw) == false) | 696 | if (!_rtl92ce_llt_table_init(hw)) |
697 | return false; | 697 | return false; |
698 | 698 | ||
699 | rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff); | 699 | rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff); |
@@ -906,7 +906,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw) | |||
906 | rtlpci->being_init_adapter = true; | 906 | rtlpci->being_init_adapter = true; |
907 | rtlpriv->intf_ops->disable_aspm(hw); | 907 | rtlpriv->intf_ops->disable_aspm(hw); |
908 | rtstatus = _rtl92ce_init_mac(hw); | 908 | rtstatus = _rtl92ce_init_mac(hw); |
909 | if (rtstatus != true) { | 909 | if (!rtstatus) { |
910 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n"); | 910 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n"); |
911 | err = 1; | 911 | err = 1; |
912 | return err; | 912 | return err; |
@@ -1117,7 +1117,7 @@ void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) | |||
1117 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, | 1117 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, |
1118 | (u8 *) (®_rcr)); | 1118 | (u8 *) (®_rcr)); |
1119 | _rtl92ce_set_bcn_ctrl_reg(hw, 0, BIT(4)); | 1119 | _rtl92ce_set_bcn_ctrl_reg(hw, 0, BIT(4)); |
1120 | } else if (check_bssid == false) { | 1120 | } else if (!check_bssid) { |
1121 | reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN)); | 1121 | reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN)); |
1122 | _rtl92ce_set_bcn_ctrl_reg(hw, BIT(4), 0); | 1122 | _rtl92ce_set_bcn_ctrl_reg(hw, BIT(4), 0); |
1123 | rtlpriv->cfg->ops->set_hw_reg(hw, | 1123 | rtlpriv->cfg->ops->set_hw_reg(hw, |
@@ -1985,8 +1985,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
1985 | e_rfpowerstate_toset = ERFON; | 1985 | e_rfpowerstate_toset = ERFON; |
1986 | ppsc->hwradiooff = false; | 1986 | ppsc->hwradiooff = false; |
1987 | actuallyset = true; | 1987 | actuallyset = true; |
1988 | } else if ((ppsc->hwradiooff == false) | 1988 | } else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) { |
1989 | && (e_rfpowerstate_toset == ERFOFF)) { | ||
1990 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, | 1989 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
1991 | "GPIOChangeRF - HW Radio OFF, RF OFF\n"); | 1990 | "GPIOChangeRF - HW Radio OFF, RF OFF\n"); |
1992 | 1991 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c index c64daf25566a..88deae67cc14 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | |||
@@ -522,8 +522,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, | |||
522 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, | 522 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
523 | "IPS Set eRf nic enable\n"); | 523 | "IPS Set eRf nic enable\n"); |
524 | rtstatus = rtl_ps_enable_nic(hw); | 524 | rtstatus = rtl_ps_enable_nic(hw); |
525 | } while ((rtstatus != true) | 525 | } while (!rtstatus && (InitializeCount < 10)); |
526 | && (InitializeCount < 10)); | ||
527 | RT_CLEAR_PS_LEVEL(ppsc, | 526 | RT_CLEAR_PS_LEVEL(ppsc, |
528 | RT_RF_OFF_LEVL_HALT_NIC); | 527 | RT_RF_OFF_LEVL_HALT_NIC); |
529 | } else { | 528 | } else { |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c index 69d720dd9c38..54c7614958a8 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | |||
@@ -503,7 +503,7 @@ static bool _rtl92ce_phy_rf6052_config_parafile(struct ieee80211_hw *hw) | |||
503 | break; | 503 | break; |
504 | } | 504 | } |
505 | 505 | ||
506 | if (rtstatus != true) { | 506 | if (!rtstatus) { |
507 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 507 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
508 | "Radio[%d] Fail!!\n", rfpath); | 508 | "Radio[%d] Fail!!\n", rfpath); |
509 | return false; | 509 | return false; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c index 8ac3bcca4d41..34e56308301e 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | |||
@@ -477,8 +477,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, | |||
477 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, | 477 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
478 | "IPS Set eRf nic enable\n"); | 478 | "IPS Set eRf nic enable\n"); |
479 | rtstatus = rtl_ps_enable_nic(hw); | 479 | rtstatus = rtl_ps_enable_nic(hw); |
480 | } while ((rtstatus != true) | 480 | } while (!rtstatus && (InitializeCount < 10)); |
481 | && (InitializeCount < 10)); | ||
482 | RT_CLEAR_PS_LEVEL(ppsc, | 481 | RT_CLEAR_PS_LEVEL(ppsc, |
483 | RT_RF_OFF_LEVL_HALT_NIC); | 482 | RT_RF_OFF_LEVL_HALT_NIC); |
484 | } else { | 483 | } else { |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c index 780c0d98a836..506b9a078ed1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | |||
@@ -479,7 +479,7 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw) | |||
479 | BRFSI_RFENV << 16, u4_regvalue); | 479 | BRFSI_RFENV << 16, u4_regvalue); |
480 | break; | 480 | break; |
481 | } | 481 | } |
482 | if (rtstatus != true) { | 482 | if (!rtstatus) { |
483 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 483 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
484 | "Radio[%d] Fail!!", rfpath); | 484 | "Radio[%d] Fail!!", rfpath); |
485 | goto phy_rf_cfg_fail; | 485 | goto phy_rf_cfg_fail; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c index 181ed6fc90e6..24b407ff0416 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c | |||
@@ -405,7 +405,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw) | |||
405 | de_digtable.last_min_undecorated_pwdb_for_dm = | 405 | de_digtable.last_min_undecorated_pwdb_for_dm = |
406 | de_digtable.min_undecorated_pwdb_for_dm; | 406 | de_digtable.min_undecorated_pwdb_for_dm; |
407 | } | 407 | } |
408 | if (rtlpriv->dm.dm_initialgain_enable == false) | 408 | if (!rtlpriv->dm.dm_initialgain_enable) |
409 | return; | 409 | return; |
410 | 410 | ||
411 | /* because we will send data pkt when scanning | 411 | /* because we will send data pkt when scanning |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c index 7d877125db29..509f5af38adf 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c | |||
@@ -707,7 +707,7 @@ static bool _rtl92de_init_mac(struct ieee80211_hw *hw) | |||
707 | 707 | ||
708 | /* System init */ | 708 | /* System init */ |
709 | /* 18. LLT_table_init(Adapter); */ | 709 | /* 18. LLT_table_init(Adapter); */ |
710 | if (_rtl92de_llt_table_init(hw) == false) | 710 | if (!_rtl92de_llt_table_init(hw)) |
711 | return false; | 711 | return false; |
712 | 712 | ||
713 | /* Clear interrupt and enable interrupt */ | 713 | /* Clear interrupt and enable interrupt */ |
@@ -920,7 +920,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw) | |||
920 | rtl92d_phy_reset_iqk_result(hw); | 920 | rtl92d_phy_reset_iqk_result(hw); |
921 | /* rtlpriv->intf_ops->disable_aspm(hw); */ | 921 | /* rtlpriv->intf_ops->disable_aspm(hw); */ |
922 | rtstatus = _rtl92de_init_mac(hw); | 922 | rtstatus = _rtl92de_init_mac(hw); |
923 | if (rtstatus != true) { | 923 | if (!rtstatus) { |
924 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n"); | 924 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n"); |
925 | err = 1; | 925 | err = 1; |
926 | spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags); | 926 | spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags); |
@@ -1147,7 +1147,7 @@ void rtl92de_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) | |||
1147 | reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); | 1147 | reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); |
1148 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); | 1148 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); |
1149 | _rtl92de_set_bcn_ctrl_reg(hw, 0, BIT(4)); | 1149 | _rtl92de_set_bcn_ctrl_reg(hw, 0, BIT(4)); |
1150 | } else if (check_bssid == false) { | 1150 | } else if (!check_bssid) { |
1151 | reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN)); | 1151 | reg_rcr &= (~(RCR_CBSSID_DATA | RCR_CBSSID_BCN)); |
1152 | _rtl92de_set_bcn_ctrl_reg(hw, BIT(4), 0); | 1152 | _rtl92de_set_bcn_ctrl_reg(hw, BIT(4), 0); |
1153 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); | 1153 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); |
@@ -2151,8 +2151,7 @@ bool rtl92de_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
2151 | e_rfpowerstate_toset = ERFON; | 2151 | e_rfpowerstate_toset = ERFON; |
2152 | ppsc->hwradiooff = false; | 2152 | ppsc->hwradiooff = false; |
2153 | actuallyset = true; | 2153 | actuallyset = true; |
2154 | } else if ((ppsc->hwradiooff == false) | 2154 | } else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) { |
2155 | && (e_rfpowerstate_toset == ERFOFF)) { | ||
2156 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, | 2155 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
2157 | "GPIOChangeRF - HW Radio OFF, RF OFF\n"); | 2156 | "GPIOChangeRF - HW Radio OFF, RF OFF\n"); |
2158 | e_rfpowerstate_toset = ERFOFF; | 2157 | e_rfpowerstate_toset = ERFOFF; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c index 9581a19c2548..93eecbd89402 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c | |||
@@ -859,7 +859,7 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw) | |||
859 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n"); | 859 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n"); |
860 | rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw, | 860 | rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw, |
861 | BASEBAND_CONFIG_PHY_REG); | 861 | BASEBAND_CONFIG_PHY_REG); |
862 | if (rtstatus != true) { | 862 | if (!rtstatus) { |
863 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n"); | 863 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n"); |
864 | return false; | 864 | return false; |
865 | } | 865 | } |
@@ -874,13 +874,13 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw) | |||
874 | rtstatus = _rtl92d_phy_config_bb_with_pgheaderfile(hw, | 874 | rtstatus = _rtl92d_phy_config_bb_with_pgheaderfile(hw, |
875 | BASEBAND_CONFIG_PHY_REG); | 875 | BASEBAND_CONFIG_PHY_REG); |
876 | } | 876 | } |
877 | if (rtstatus != true) { | 877 | if (!rtstatus) { |
878 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n"); | 878 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n"); |
879 | return false; | 879 | return false; |
880 | } | 880 | } |
881 | rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw, | 881 | rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw, |
882 | BASEBAND_CONFIG_AGC_TAB); | 882 | BASEBAND_CONFIG_AGC_TAB); |
883 | if (rtstatus != true) { | 883 | if (!rtstatus) { |
884 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n"); | 884 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n"); |
885 | return false; | 885 | return false; |
886 | } | 886 | } |
@@ -1129,7 +1129,7 @@ void rtl92d_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel) | |||
1129 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1129 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1130 | u8 cckpowerlevel[2], ofdmpowerlevel[2]; | 1130 | u8 cckpowerlevel[2], ofdmpowerlevel[2]; |
1131 | 1131 | ||
1132 | if (rtlefuse->txpwr_fromeprom == false) | 1132 | if (!rtlefuse->txpwr_fromeprom) |
1133 | return; | 1133 | return; |
1134 | channel = _rtl92c_phy_get_rightchnlplace(channel); | 1134 | channel = _rtl92c_phy_get_rightchnlplace(channel); |
1135 | _rtl92d_get_txpower_index(hw, channel, &cckpowerlevel[0], | 1135 | _rtl92d_get_txpower_index(hw, channel, &cckpowerlevel[0], |
@@ -3320,8 +3320,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw, | |||
3320 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, | 3320 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
3321 | "IPS Set eRf nic enable\n"); | 3321 | "IPS Set eRf nic enable\n"); |
3322 | rtstatus = rtl_ps_enable_nic(hw); | 3322 | rtstatus = rtl_ps_enable_nic(hw); |
3323 | } while ((rtstatus != true) && | 3323 | } while (!rtstatus && (InitializeCount < 10)); |
3324 | (InitializeCount < 10)); | ||
3325 | 3324 | ||
3326 | RT_CLEAR_PS_LEVEL(ppsc, | 3325 | RT_CLEAR_PS_LEVEL(ppsc, |
3327 | RT_RF_OFF_LEVL_HALT_NIC); | 3326 | RT_RF_OFF_LEVL_HALT_NIC); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/rf.c b/drivers/net/wireless/rtlwifi/rtl8192de/rf.c index ff34d2dd39b8..3066a7fb0b57 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/rf.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/rf.c | |||
@@ -601,7 +601,7 @@ bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw) | |||
601 | u4_regvalue); | 601 | u4_regvalue); |
602 | break; | 602 | break; |
603 | } | 603 | } |
604 | if (rtstatus != true) { | 604 | if (!rtstatus) { |
605 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 605 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
606 | "Radio[%d] Fail!!", rfpath); | 606 | "Radio[%d] Fail!!", rfpath); |
607 | goto phy_rf_cfg_fail; | 607 | goto phy_rf_cfg_fail; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c index 0d8bf5657008..380e7d4b1ccf 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c | |||
@@ -272,7 +272,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, | |||
272 | 272 | ||
273 | /* Turn On CPU */ | 273 | /* Turn On CPU */ |
274 | rtstatus = _rtl92s_firmware_enable_cpu(hw); | 274 | rtstatus = _rtl92s_firmware_enable_cpu(hw); |
275 | if (rtstatus != true) { | 275 | if (!rtstatus) { |
276 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 276 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
277 | "Enable CPU fail!\n"); | 277 | "Enable CPU fail!\n"); |
278 | goto status_check_fail; | 278 | goto status_check_fail; |
@@ -445,14 +445,14 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) | |||
445 | rtstatus = _rtl92s_firmware_downloadcode(hw, puc_mappedfile, | 445 | rtstatus = _rtl92s_firmware_downloadcode(hw, puc_mappedfile, |
446 | ul_filelength); | 446 | ul_filelength); |
447 | 447 | ||
448 | if (rtstatus != true) { | 448 | if (!rtstatus) { |
449 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n"); | 449 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n"); |
450 | goto fail; | 450 | goto fail; |
451 | } | 451 | } |
452 | 452 | ||
453 | /* <3> Check whether load FW process is ready */ | 453 | /* <3> Check whether load FW process is ready */ |
454 | rtstatus = _rtl92s_firmware_checkready(hw, fwstatus); | 454 | rtstatus = _rtl92s_firmware_checkready(hw, fwstatus); |
455 | if (rtstatus != true) { | 455 | if (!rtstatus) { |
456 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n"); | 456 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n"); |
457 | goto fail; | 457 | goto fail; |
458 | } | 458 | } |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c index 22098c2f38f1..b141c35bf926 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c | |||
@@ -962,7 +962,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) | |||
962 | rtlhal->fwcmd_ioparam = rtl_read_dword(rtlpriv, LBUS_ADDR_MASK); | 962 | rtlhal->fwcmd_ioparam = rtl_read_dword(rtlpriv, LBUS_ADDR_MASK); |
963 | 963 | ||
964 | /* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */ | 964 | /* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */ |
965 | if (rtl92s_phy_mac_config(hw) != true) { | 965 | if (!rtl92s_phy_mac_config(hw)) { |
966 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "MAC Config failed\n"); | 966 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "MAC Config failed\n"); |
967 | return rtstatus; | 967 | return rtstatus; |
968 | } | 968 | } |
@@ -972,7 +972,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) | |||
972 | rtl_write_dword(rtlpriv, CMDR, 0x37FC); | 972 | rtl_write_dword(rtlpriv, CMDR, 0x37FC); |
973 | 973 | ||
974 | /* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */ | 974 | /* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */ |
975 | if (rtl92s_phy_bb_config(hw) != true) { | 975 | if (!rtl92s_phy_bb_config(hw)) { |
976 | RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n"); | 976 | RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n"); |
977 | return rtstatus; | 977 | return rtstatus; |
978 | } | 978 | } |
@@ -1008,7 +1008,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) | |||
1008 | else | 1008 | else |
1009 | rtl_write_byte(rtlpriv, RF_CTRL, 0x07); | 1009 | rtl_write_byte(rtlpriv, RF_CTRL, 0x07); |
1010 | 1010 | ||
1011 | if (rtl92s_phy_rf_config(hw) != true) { | 1011 | if (!rtl92s_phy_rf_config(hw)) { |
1012 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n"); | 1012 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n"); |
1013 | return rtstatus; | 1013 | return rtstatus; |
1014 | } | 1014 | } |
@@ -1105,7 +1105,7 @@ void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) | |||
1105 | if (check_bssid) { | 1105 | if (check_bssid) { |
1106 | reg_rcr |= (RCR_CBSSID); | 1106 | reg_rcr |= (RCR_CBSSID); |
1107 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); | 1107 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); |
1108 | } else if (check_bssid == false) { | 1108 | } else if (!check_bssid) { |
1109 | reg_rcr &= (~RCR_CBSSID); | 1109 | reg_rcr &= (~RCR_CBSSID); |
1110 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); | 1110 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); |
1111 | } | 1111 | } |
@@ -2306,7 +2306,7 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
2306 | rfpwr_toset = ERFON; | 2306 | rfpwr_toset = ERFON; |
2307 | ppsc->hwradiooff = false; | 2307 | ppsc->hwradiooff = false; |
2308 | actuallyset = true; | 2308 | actuallyset = true; |
2309 | } else if ((ppsc->hwradiooff == false) && (rfpwr_toset == ERFOFF)) { | 2309 | } else if ((!ppsc->hwradiooff) && (rfpwr_toset == ERFOFF)) { |
2310 | RT_TRACE(rtlpriv, COMP_RF, | 2310 | RT_TRACE(rtlpriv, COMP_RF, |
2311 | DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n"); | 2311 | DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n"); |
2312 | 2312 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c index 05b4e2790e99..3bfc411f13b8 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c | |||
@@ -558,8 +558,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw, | |||
558 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, | 558 | RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
559 | "IPS Set eRf nic enable\n"); | 559 | "IPS Set eRf nic enable\n"); |
560 | rtstatus = rtl_ps_enable_nic(hw); | 560 | rtstatus = rtl_ps_enable_nic(hw); |
561 | } while ((rtstatus != true) && | 561 | } while (!rtstatus && (InitializeCount < 10)); |
562 | (InitializeCount < 10)); | ||
563 | 562 | ||
564 | RT_CLEAR_PS_LEVEL(ppsc, | 563 | RT_CLEAR_PS_LEVEL(ppsc, |
565 | RT_RF_OFF_LEVL_HALT_NIC); | 564 | RT_RF_OFF_LEVL_HALT_NIC); |
@@ -990,7 +989,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw) | |||
990 | rtstatus = false; | 989 | rtstatus = false; |
991 | } | 990 | } |
992 | 991 | ||
993 | if (rtstatus != true) { | 992 | if (!rtstatus) { |
994 | RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, | 993 | RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, |
995 | "Write BB Reg Fail!!\n"); | 994 | "Write BB Reg Fail!!\n"); |
996 | goto phy_BB8190_Config_ParaFile_Fail; | 995 | goto phy_BB8190_Config_ParaFile_Fail; |
@@ -1004,7 +1003,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw) | |||
1004 | rtstatus = _rtl92s_phy_config_bb_with_pg(hw, | 1003 | rtstatus = _rtl92s_phy_config_bb_with_pg(hw, |
1005 | BASEBAND_CONFIG_PHY_REG); | 1004 | BASEBAND_CONFIG_PHY_REG); |
1006 | } | 1005 | } |
1007 | if (rtstatus != true) { | 1006 | if (!rtstatus) { |
1008 | RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, | 1007 | RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, |
1009 | "_rtl92s_phy_bb_config_parafile(): BB_PG Reg Fail!!\n"); | 1008 | "_rtl92s_phy_bb_config_parafile(): BB_PG Reg Fail!!\n"); |
1010 | goto phy_BB8190_Config_ParaFile_Fail; | 1009 | goto phy_BB8190_Config_ParaFile_Fail; |
@@ -1013,7 +1012,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw) | |||
1013 | /* 3. BB AGC table Initialization */ | 1012 | /* 3. BB AGC table Initialization */ |
1014 | rtstatus = _rtl92s_phy_config_bb(hw, BASEBAND_CONFIG_AGC_TAB); | 1013 | rtstatus = _rtl92s_phy_config_bb(hw, BASEBAND_CONFIG_AGC_TAB); |
1015 | 1014 | ||
1016 | if (rtstatus != true) { | 1015 | if (!rtstatus) { |
1017 | pr_err("%s(): AGC Table Fail\n", __func__); | 1016 | pr_err("%s(): AGC Table Fail\n", __func__); |
1018 | goto phy_BB8190_Config_ParaFile_Fail; | 1017 | goto phy_BB8190_Config_ParaFile_Fail; |
1019 | } | 1018 | } |
@@ -1270,7 +1269,7 @@ void rtl92s_phy_set_txpower(struct ieee80211_hw *hw, u8 channel) | |||
1270 | /* [0]:RF-A, [1]:RF-B */ | 1269 | /* [0]:RF-A, [1]:RF-B */ |
1271 | u8 cckpowerlevel[2], ofdmpowerLevel[2]; | 1270 | u8 cckpowerlevel[2], ofdmpowerLevel[2]; |
1272 | 1271 | ||
1273 | if (rtlefuse->txpwr_fromeprom == false) | 1272 | if (!rtlefuse->txpwr_fromeprom) |
1274 | return; | 1273 | return; |
1275 | 1274 | ||
1276 | /* Mainly we use RF-A Tx Power to write the Tx Power registers, | 1275 | /* Mainly we use RF-A Tx Power to write the Tx Power registers, |
@@ -1621,7 +1620,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio) | |||
1621 | break; | 1620 | break; |
1622 | case FW_CMD_HIGH_PWR_ENABLE: | 1621 | case FW_CMD_HIGH_PWR_ENABLE: |
1623 | if (!(rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) && | 1622 | if (!(rtlpriv->dm.dm_flag & HAL_DM_HIPWR_DISABLE) && |
1624 | (rtlpriv->dm.dynamic_txpower_enable != true)) { | 1623 | !rtlpriv->dm.dynamic_txpower_enable) { |
1625 | fw_cmdmap |= (FW_HIGH_PWR_ENABLE_CTL | | 1624 | fw_cmdmap |= (FW_HIGH_PWR_ENABLE_CTL | |
1626 | FW_SS_CTL); | 1625 | FW_SS_CTL); |
1627 | FW_CMD_IO_SET(rtlpriv, fw_cmdmap); | 1626 | FW_CMD_IO_SET(rtlpriv, fw_cmdmap); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c index ad51906124db..08c2f5625129 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c | |||
@@ -499,7 +499,7 @@ bool rtl92s_phy_rf6052_config(struct ieee80211_hw *hw) | |||
499 | break; | 499 | break; |
500 | } | 500 | } |
501 | 501 | ||
502 | if (rtstatus != true) { | 502 | if (!rtstatus) { |
503 | pr_err("Radio[%d] Fail!!\n", rfpath); | 503 | pr_err("Radio[%d] Fail!!\n", rfpath); |
504 | goto fail; | 504 | goto fail; |
505 | } | 505 | } |