Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: rtl8192e: Don't compare bHwRadioOff with true

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Mike McCormack and committed by
Greg Kroah-Hartman
f500e256 5b3b1a7b

+24 -24
+3 -3
drivers/staging/rtl8192e/r8192E_core.c
··· 1165 1165 /* shall not be referred by command packet */ 1166 1166 assert(queue_index != TXCMD_QUEUE); 1167 1167 1168 - if((priv->bHwRadioOff == true)||(!priv->up)) 1168 + if (priv->bHwRadioOff ||(!priv->up)) 1169 1169 { 1170 1170 kfree_skb(skb); 1171 1171 return; ··· 1213 1213 u8 queue_index = tcb_desc->queue_index; 1214 1214 1215 1215 if(queue_index != TXCMD_QUEUE){ 1216 - if((priv->bHwRadioOff == true)||(!priv->up)) 1216 + if (priv->bHwRadioOff ||(!priv->up)) 1217 1217 { 1218 1218 kfree_skb(skb); 1219 1219 return 0; ··· 4654 4654 static u8 last_time = 0; 4655 4655 bool bEnterPS = false; 4656 4656 4657 - if((!priv->up) || (priv->bHwRadioOff == true)) 4657 + if ((!priv->up) || priv->bHwRadioOff) 4658 4658 return; 4659 4659 4660 4660 if(!priv->up)
+2 -2
drivers/staging/rtl8192e/r8192E_dm.c
··· 2945 2945 2946 2946 eRfPowerStateToSet = (tmp1byte&BIT1) ? eRfOn : eRfOff; 2947 2947 2948 - if( (priv->bHwRadioOff == true) && (eRfPowerStateToSet == eRfOn)) 2948 + if (priv->bHwRadioOff && (eRfPowerStateToSet == eRfOn)) 2949 2949 { 2950 2950 RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio ON\n"); 2951 2951 2952 2952 priv->bHwRadioOff = false; 2953 2953 bActuallySet = true; 2954 2954 } 2955 - else if ( (priv->bHwRadioOff == false) && (eRfPowerStateToSet == eRfOff)) 2955 + else if ( (!priv->bHwRadioOff) && (eRfPowerStateToSet == eRfOff)) 2956 2956 { 2957 2957 RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio OFF\n"); 2958 2958 priv->bHwRadioOff = true;
+19 -19
drivers/staging/rtl8192e/r8192E_wx.c
··· 70 70 int ret; 71 71 struct r8192_priv *priv = ieee80211_priv(dev); 72 72 73 - if(priv->bHwRadioOff == true) 73 + if (priv->bHwRadioOff) 74 74 return 0; 75 75 76 76 down(&priv->wx_sem); ··· 90 90 int ret; 91 91 struct r8192_priv *priv = ieee80211_priv(dev); 92 92 93 - if(priv->bHwRadioOff == true) 93 + if (priv->bHwRadioOff) 94 94 return 0; 95 95 96 96 down(&priv->wx_sem); ··· 117 117 int ret; 118 118 struct r8192_priv *priv = ieee80211_priv(dev); 119 119 120 - if(priv->bHwRadioOff == true) 120 + if (priv->bHwRadioOff) 121 121 return 0; 122 122 123 123 down(&priv->wx_sem); ··· 144 144 struct r8192_priv *priv = ieee80211_priv(dev); 145 145 int ret; 146 146 147 - if(priv->bHwRadioOff == true) 147 + if (priv->bHwRadioOff) 148 148 return 0; 149 149 150 150 down(&priv->wx_sem); ··· 182 182 int enable = (parms[0] > 0); 183 183 short prev = priv->crcmon; 184 184 185 - if(priv->bHwRadioOff == true) 185 + if (priv->bHwRadioOff) 186 186 return 0; 187 187 188 188 down(&priv->wx_sem); ··· 212 212 RT_RF_POWER_STATE rtState; 213 213 int ret; 214 214 215 - if(priv->bHwRadioOff == true) 215 + if (priv->bHwRadioOff) 216 216 return 0; 217 217 218 218 rtState = priv->ieee80211->eRFPowerState; ··· 383 383 RT_RF_POWER_STATE rtState; 384 384 int ret; 385 385 386 - if(priv->bHwRadioOff == true) 386 + if (priv->bHwRadioOff) 387 387 return 0; 388 388 389 389 rtState = priv->ieee80211->eRFPowerState; ··· 452 452 int ret; 453 453 struct r8192_priv *priv = ieee80211_priv(dev); 454 454 455 - if(priv->bHwRadioOff == true) 455 + if (priv->bHwRadioOff) 456 456 return 0; 457 457 458 458 if(!priv->up) return -ENETDOWN; ··· 474 474 RT_RF_POWER_STATE rtState; 475 475 int ret; 476 476 477 - if(priv->bHwRadioOff == true) 477 + if (priv->bHwRadioOff) 478 478 return 0; 479 479 480 480 rtState = priv->ieee80211->eRFPowerState; ··· 518 518 int ret; 519 519 struct r8192_priv *priv = ieee80211_priv(dev); 520 520 521 - if(priv->bHwRadioOff == true) 521 + if (priv->bHwRadioOff) 522 522 return 0; 523 523 524 524 down(&priv->wx_sem); ··· 544 544 { 545 545 struct r8192_priv *priv = ieee80211_priv(dev); 546 546 547 - if(priv->bHwRadioOff == true) 547 + if (priv->bHwRadioOff) 548 548 return 0; 549 549 550 550 if (wrqu->frag.disabled) ··· 585 585 struct r8192_priv *priv = ieee80211_priv(dev); 586 586 // struct sockaddr *temp = (struct sockaddr *)awrq; 587 587 588 - if(priv->bHwRadioOff == true) 588 + if (priv->bHwRadioOff) 589 589 return 0; 590 590 591 591 down(&priv->wx_sem); ··· 641 641 {0x00,0x00,0x00,0x00,0x00,0x03} }; 642 642 int i; 643 643 644 - if(priv->bHwRadioOff == true) 644 + if (priv->bHwRadioOff) 645 645 return 0; 646 646 647 647 if(!priv->up) return -ENETDOWN; ··· 786 786 struct r8192_priv *priv = ieee80211_priv(dev); 787 787 int err = 0; 788 788 789 - if(priv->bHwRadioOff == true) 789 + if (priv->bHwRadioOff) 790 790 return 0; 791 791 792 792 down(&priv->wx_sem); ··· 882 882 883 883 short err = 0; 884 884 885 - if(priv->bHwRadioOff == true) 885 + if (priv->bHwRadioOff) 886 886 return 0; 887 887 888 888 down(&priv->wx_sem); ··· 911 911 struct r8192_priv *priv = ieee80211_priv(dev); 912 912 struct ieee80211_device* ieee = priv->ieee80211; 913 913 914 - if(priv->bHwRadioOff == true) 914 + if (priv->bHwRadioOff) 915 915 return 0; 916 916 917 917 down(&priv->wx_sem); ··· 1016 1016 //printk("====>%s()\n", __FUNCTION__); 1017 1017 struct r8192_priv *priv = ieee80211_priv(dev); 1018 1018 1019 - if(priv->bHwRadioOff == true) 1019 + if (priv->bHwRadioOff) 1020 1020 return 0; 1021 1021 1022 1022 down(&priv->wx_sem); ··· 1034 1034 int ret=0; 1035 1035 struct r8192_priv *priv = ieee80211_priv(dev); 1036 1036 1037 - if(priv->bHwRadioOff == true) 1037 + if (priv->bHwRadioOff) 1038 1038 return 0; 1039 1039 1040 1040 down(&priv->wx_sem); ··· 1051 1051 int ret=0; 1052 1052 struct r8192_priv *priv = ieee80211_priv(dev); 1053 1053 1054 - if(priv->bHwRadioOff == true) 1054 + if (priv->bHwRadioOff) 1055 1055 return 0; 1056 1056 1057 1057 down(&priv->wx_sem);