staging: rtl8192u: bool tests don't need comparisons
PATCH v2 1/1 staging: rtl8192u: bool tests don't need comparisons
Remove explicit true/false comparations to bool variables.
Signed-off-by Luis de Bethencourt <[email protected]>
--- drivers/staging/rtl8192u/r8192U_core.c | 13 ++++--------- drivers/staging/rtl8192u/r8192U_dm.c | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 19 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +4 -9
@@ -2043,16 +2043,10 @@ static bool GetNmodeSupportBySecCfg8192(struct net_device *dev)static bool GetHalfNmodeSupportByAPs819xUsb (struct net_device *dev) { -bool Reval;struct r8192_priv *priv =ieee80211_priv (dev);struct ieee80211_device *ieee = priv->ieee80211; -if (ieee->bHalfWirelessN24GMode == true) - Reval = true; -else - Reval = false; - -return Reval; +return ieee->bHalfWirelessN24GMode; }static void rtl8192_refresh_supportrate (struct r8192_priv *priv)
@@ -2762,7 +2756,7 @@ static bool rtl8192_adapter_start(struct net_device *dev)// #ifdef TO_DO_LIST if (Adapter->ResetProgress ==RESET_TYPE_NORESET ) { -if (pMgntInfo->RegRfOff == true) {/* User disable RF via registry. */ +if (pMgntInfo->RegRfOff) {/* User disable RF via registry. */ RT_TRACE ((COMP_INIT |COMP_RF ),DBG_LOUD , ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n" ));MgntActSet_RF_State (Adapter, eRfOff,RF_CHANGE_BY_SW );// Those actions will be discard in MgntActSet_RF_State because of the same state
@@ -4406,7 +4400,8 @@ static void query_rxdesc_status(struct sk_buff *skb,/* RTL8190 set this bit to indicate that Hw does not decrypt packet */ stats->Decrypted = !desc->SWDec; -if ((priv->ieee80211->pHTInfo->bCurrentHTSupport == true) && (priv->ieee80211->pairwise_key_type ==KEY_TYPE_CCMP )) +if ((priv->ieee80211->pHTInfo->bCurrentHTSupport) && + (priv->ieee80211->pairwise_key_type ==KEY_TYPE_CCMP )) stats->bHwError = false;else stats->bHwError = stats->bCRC|stats->bICV;
drivers/staging/rtl8192u/r8192U_dm.c +11 -10
@@ -438,7 +438,7 @@ static void dm_bandwidth_autoswitch(struct net_device *dev)if (priv->CurrentChannelBW ==HT_CHANNEL_WIDTH_20 || !priv->ieee80211->bandwidth_auto_switch.bautoswitch_enable)return ; -if (priv->ieee80211->bandwidth_auto_switch.bforced_tx20Mhz == false) {/* If send packets in 40 Mhz in 20/40 */ +if (!priv->ieee80211->bandwidth_auto_switch.bforced_tx20Mhz) {/* If send packets in 40 Mhz in 20/40 */ if (priv->undecorated_smoothed_pwdb <= priv->ieee80211->bandwidth_auto_switch.threshold_40Mhzto20Mhz) priv->ieee80211->bandwidth_auto_switch.bforced_tx20Mhz = true; }else {/* in force send packets in 20 Mhz in 20/40 */
@@ -563,7 +563,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)break ; } } -if (viviflag == true) { +if (viviflag) {write_nic_byte (dev,0x1ba ,0 ); viviflag = false;RT_TRACE (COMP_POWER_TRACKING ,"we filtered the data\n" );
@@ -766,7 +766,7 @@ void dm_txpower_trackingcallback(struct work_struct *work) struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq);struct net_device *dev = priv->ieee80211->dev; -if (priv->bDcut == true) +if (priv->bDcut)dm_TXPowerTrackingCallback_TSSI (dev);else dm_TXPowerTrackingCallback_ThermalMeter (dev);
@@ -1301,7 +1301,7 @@ void dm_initialize_txpower_tracking(struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev); -if (priv->bDcut == true) +if (priv->bDcut)dm_InitializeTXPowerTracking_TSSI (dev);else dm_InitializeTXPowerTracking_ThermalMeter (dev);
@@ -1357,7 +1357,7 @@ static void dm_check_txpower_tracking(struct net_device *dev)#ifdef RTL8190P dm_CheckTXPowerTracking_TSSI (dev);#else -if (priv->bDcut == true) +if (priv->bDcut)dm_CheckTXPowerTracking_TSSI (dev);else dm_CheckTXPowerTracking_ThermalMeter (dev);
@@ -1467,7 +1467,7 @@ void dm_cck_txpower_adjust(struct net_device *dev, bool binch14) {/* dm_CCKTxPowerAdjust */ struct r8192_priv *priv =ieee80211_priv (dev); -if (priv->bDcut == true) +if (priv->bDcut)dm_CCKTxPowerAdjust_TSSI (dev, binch14);else dm_CCKTxPowerAdjust_ThermalMeter (dev, binch14);
@@ -1731,7 +1731,7 @@ static void dm_dig_init(struct net_device *dev)*---------------------------------------------------------------------------*/ static void dm_ctrl_initgain_byrssi (struct net_device *dev) { -if (dm_digtable.dig_enable_flag == false) +if (!dm_digtable.dig_enable_flag)return ;if (dm_digtable.dig_algorithm ==DIG_ALGO_BY_FALSE_ALARM )
@@ -1750,7 +1750,7 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi(u8 i;static u8 fw_dig; -if (dm_digtable.dig_enable_flag == false) +if (!dm_digtable.dig_enable_flag)return ;/*DbgPrint("Dig by Sw Rssi\n");*/
@@ -1792,7 +1792,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(static u32 reset_cnt;u8 i; -if (dm_digtable.dig_enable_flag == false) +if (!dm_digtable.dig_enable_flag)return ;if (dm_digtable.dig_algorithm_switch) {
@@ -3062,7 +3062,8 @@ static void dm_dynamic_txpower(struct net_device *dev) priv->bDynamicTxLowPower = false; }else {/* high power state check */ -if (priv->undecorated_smoothed_pwdb < txlowpower_threshold && priv->bDynamicTxHighPower == true) +if (priv->undecorated_smoothed_pwdb < + txlowpower_threshold && priv->bDynamicTxHighPower) priv->bDynamicTxHighPower = false;/* low power state check */
Signature · 1 line
2.1.4
Greg Kroah-Hartman
maintainerQuoted 7 lines · Luis de Bethencourt
Remove explicit true/false comparations to bool variables.
Signed-off-by Luis de Bethencourt <[email protected]>--- drivers/staging/rtl8192u/r8192U_core.c | 13 ++++--------- drivers/staging/rtl8192u/r8192U_dm.c | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 19 deletions(-)
You've sent multiple patches for this driver, and different versions, yet I don't know which to apply, so I'm going to just drop them all. Please resend the latest versions of your patches, and properly number them as to which gets applied in which order.
thanks,
greg k-h