Skip to content

L
linux
Commit 9cf66a95 authored by Adam Rall's avatar Adam Rall Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rtl8187se: fixed coding style issues 

Fixed checkpatch.pl errors in r8180_dm.c.
Signed-off-by: default avatarAdam Rall <adam.rall4@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e72f8762
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 41 deletions
drivers/staging/rtl8187se/r8180_dm.c
View file @ 9cf66a95
...@@ -10,10 +10,10 @@ bool CheckHighPower(struct net_device *dev) ...@@ -10,10 +10,10 @@ bool CheckHighPower(struct net_device *dev)
struct r8180_priv *priv = ieee80211_priv(dev); struct r8180_priv *priv = ieee80211_priv(dev);
struct ieee80211_device *ieee = priv->ieee80211; struct ieee80211_device *ieee = priv->ieee80211;
if(!priv->bRegHighPowerMechanism) if (!priv->bRegHighPowerMechanism)
return false; return false;
if(ieee->state == IEEE80211_LINKED_SCANNING) if (ieee->state == IEEE80211_LINKED_SCANNING)
return false; return false;
return true; return true;
...@@ -57,15 +57,15 @@ void DoTxHighPower(struct net_device *dev) ...@@ -57,15 +57,15 @@ void DoTxHighPower(struct net_device *dev)
/* Stevenl suggested that degrade 8dbm in high power sate. 2007-12-04 Isaiah */ /* Stevenl suggested that degrade 8dbm in high power sate. 2007-12-04 Isaiah */
priv->bToUpdateTxPwr = true; priv->bToUpdateTxPwr = true;
u1bTmp= read_nic_byte(dev, CCK_TXAGC); u1bTmp = read_nic_byte(dev, CCK_TXAGC);
/* If it never enter High Power. */ /* If it never enter High Power. */
if (CckTxPwrIdx == u1bTmp) { if (CckTxPwrIdx == u1bTmp) {
u1bTmp = (u1bTmp > 16) ? (u1bTmp -16): 0; /* 8dbm */ u1bTmp = (u1bTmp > 16) ? (u1bTmp - 16) : 0; /* 8dbm */
write_nic_byte(dev, CCK_TXAGC, u1bTmp); write_nic_byte(dev, CCK_TXAGC, u1bTmp);
u1bTmp= read_nic_byte(dev, OFDM_TXAGC); u1bTmp = read_nic_byte(dev, OFDM_TXAGC);
u1bTmp = (u1bTmp > 16) ? (u1bTmp -16): 0; /* 8dbm */ u1bTmp = (u1bTmp > 16) ? (u1bTmp - 16) : 0; /* 8dbm */
write_nic_byte(dev, OFDM_TXAGC, u1bTmp); write_nic_byte(dev, OFDM_TXAGC, u1bTmp);
} }
...@@ -74,12 +74,12 @@ void DoTxHighPower(struct net_device *dev) ...@@ -74,12 +74,12 @@ void DoTxHighPower(struct net_device *dev)
if (priv->bToUpdateTxPwr) { if (priv->bToUpdateTxPwr) {
priv->bToUpdateTxPwr = false; priv->bToUpdateTxPwr = false;
/* SD3 required. */ /* SD3 required. */
u1bTmp= read_nic_byte(dev, CCK_TXAGC); u1bTmp = read_nic_byte(dev, CCK_TXAGC);
if (u1bTmp < CckTxPwrIdx) { if (u1bTmp < CckTxPwrIdx) {
write_nic_byte(dev, CCK_TXAGC, CckTxPwrIdx); write_nic_byte(dev, CCK_TXAGC, CckTxPwrIdx);
} }
u1bTmp= read_nic_byte(dev, OFDM_TXAGC); u1bTmp = read_nic_byte(dev, OFDM_TXAGC);
if (u1bTmp < OfdmTxPwrIdx) { if (u1bTmp < OfdmTxPwrIdx) {
write_nic_byte(dev, OFDM_TXAGC, OfdmTxPwrIdx); write_nic_byte(dev, OFDM_TXAGC, OfdmTxPwrIdx);
} }
...@@ -97,7 +97,7 @@ void DoTxHighPower(struct net_device *dev) ...@@ -97,7 +97,7 @@ void DoTxHighPower(struct net_device *dev)
void rtl8180_tx_pw_wq(struct work_struct *work) void rtl8180_tx_pw_wq(struct work_struct *work)
{ {
struct delayed_work *dwork = to_delayed_work(work); struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, tx_pw_wq);
struct net_device *dev = ieee->dev; struct net_device *dev = ieee->dev;
DoTxHighPower(dev); DoTxHighPower(dev);
...@@ -149,11 +149,11 @@ void DIG_Zebra(struct net_device *dev) ...@@ -149,11 +149,11 @@ void DIG_Zebra(struct net_device *dev)
#if 1 /* lzm reserved 080826 */ #if 1 /* lzm reserved 080826 */
AwakePeriodIn2Sec = (2000 - priv->DozePeriodInPast2Sec); AwakePeriodIn2Sec = (2000 - priv->DozePeriodInPast2Sec);
priv ->DozePeriodInPast2Sec = 0; priv->DozePeriodInPast2Sec = 0;
if (AwakePeriodIn2Sec) { if (AwakePeriodIn2Sec) {
OfdmFA1 = (u16)((OfdmFA1 * AwakePeriodIn2Sec) / 2000) ; OfdmFA1 = (u16)((OfdmFA1 * AwakePeriodIn2Sec) / 2000);
OfdmFA2 = (u16)((OfdmFA2 * AwakePeriodIn2Sec) / 2000) ; OfdmFA2 = (u16)((OfdmFA2 * AwakePeriodIn2Sec) / 2000);
} else { } else {
; ;
} }
...@@ -210,7 +210,7 @@ void DynamicInitGain(struct net_device *dev) ...@@ -210,7 +210,7 @@ void DynamicInitGain(struct net_device *dev)
void rtl8180_hw_dig_wq(struct work_struct *work) void rtl8180_hw_dig_wq(struct work_struct *work)
{ {
struct delayed_work *dwork = to_delayed_work(work); struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, hw_dig_wq);
struct net_device *dev = ieee->dev; struct net_device *dev = ieee->dev;
struct r8180_priv *priv = ieee80211_priv(dev); struct r8180_priv *priv = ieee80211_priv(dev);
...@@ -234,7 +234,7 @@ int IncludedInSupportedRates(struct r8180_priv *priv, u8 TxRate) ...@@ -234,7 +234,7 @@ int IncludedInSupportedRates(struct r8180_priv *priv, u8 TxRate)
rate_len = priv->ieee80211->current_network.rates_len; rate_len = priv->ieee80211->current_network.rates_len;
rate_ex_len = priv->ieee80211->current_network.rates_ex_len; rate_ex_len = priv->ieee80211->current_network.rates_ex_len;
for (idx=0; idx < rate_len; idx++) { for (idx = 0; idx < rate_len; idx++) {
if ((priv->ieee80211->current_network.rates[idx] & RateMask) == NaiveTxRate) { if ((priv->ieee80211->current_network.rates[idx] & RateMask) == NaiveTxRate) {
Found = 1; Found = 1;
goto found_rate; goto found_rate;
...@@ -247,7 +247,7 @@ int IncludedInSupportedRates(struct r8180_priv *priv, u8 TxRate) ...@@ -247,7 +247,7 @@ int IncludedInSupportedRates(struct r8180_priv *priv, u8 TxRate)
} }
} }
return Found; return Found;
found_rate: found_rate:
return Found; return Found;
} }
...@@ -397,7 +397,7 @@ void TxPwrTracking87SE(struct net_device *dev) ...@@ -397,7 +397,7 @@ void TxPwrTracking87SE(struct net_device *dev)
tmpu1Byte = read_nic_byte(dev, EN_LPF_CAL); tmpu1Byte = read_nic_byte(dev, EN_LPF_CAL);
CurrentThermal = (tmpu1Byte & 0xf0) >> 4; /*[ 7:4]: thermal meter indication. */ CurrentThermal = (tmpu1Byte & 0xf0) >> 4; /*[ 7:4]: thermal meter indication. */
CurrentThermal = (CurrentThermal > 0x0c) ? 0x0c:CurrentThermal;/* lzm add 080826 */ CurrentThermal = (CurrentThermal > 0x0c) ? 0x0c : CurrentThermal;/* lzm add 080826 */
if (CurrentThermal != priv->ThermalMeter) { if (CurrentThermal != priv->ThermalMeter) {
/* Update Tx Power level on each channel. */ /* Update Tx Power level on each channel. */
...@@ -577,8 +577,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -577,8 +577,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
if (bTryDown && (CurrSignalStrength < -75)) /* cable link */ if (bTryDown && (CurrSignalStrength < -75)) /* cable link */
priv->TryDownCountLowData += TryDownTh; priv->TryDownCountLowData += TryDownTh;
} } else if (priv->CurrentOperaRate == 96) {
else if (priv->CurrentOperaRate == 96) {
/* 2For 48Mbps */ /* 2For 48Mbps */
/* Air Link */ /* Air Link */
if (((CurrRetryRate > 48) && (priv->LastRetryRate > 47))) { if (((CurrRetryRate > 48) && (priv->LastRetryRate > 47))) {
...@@ -593,7 +592,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -593,7 +592,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
bTryUp = true; bTryUp = true;
} }
if (bTryDown && (CurrSignalStrength < -75)){ if (bTryDown && (CurrSignalStrength < -75)) {
priv->TryDownCountLowData += TryDownTh; priv->TryDownCountLowData += TryDownTh;
} }
} else if (priv->CurrentOperaRate == 72) { } else if (priv->CurrentOperaRate == 72) {
...@@ -618,7 +617,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -618,7 +617,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
bTryDown = true; bTryDown = true;
} else if (((CurrRetryRate > 33) && (priv->LastRetryRate > 32)) && (CurrSignalStrength > -82)) { /* Cable Link */ } else if (((CurrRetryRate > 33) && (priv->LastRetryRate > 32)) && (CurrSignalStrength > -82)) { /* Cable Link */
bTryDown = true; bTryDown = true;
} else if ((CurrRetryRate > (priv->LastRetryRate + 50)) && (priv->FailTxRateCount > 2 )) { } else if ((CurrRetryRate > (priv->LastRetryRate + 50)) && (priv->FailTxRateCount > 2)) {
bTryDown = true; bTryDown = true;
priv->TryDownCountLowData += TryDownTh; priv->TryDownCountLowData += TryDownTh;
} else if ((CurrRetryRate < 20) && (priv->LastRetryRate < 21)) { /* TO DO: need to consider (RSSI) */ } else if ((CurrRetryRate < 20) && (priv->LastRetryRate < 21)) { /* TO DO: need to consider (RSSI) */
...@@ -641,8 +640,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -641,8 +640,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
/* 2For 11Mbps */ /* 2For 11Mbps */
if (CurrRetryRate > 95) { if (CurrRetryRate > 95) {
bTryDown = true; bTryDown = true;
} } else if ((CurrRetryRate < 29) && (priv->LastRetryRate < 30)) { /*TO DO: need to consider (RSSI) */
else if ((CurrRetryRate < 29) && (priv->LastRetryRate < 30)) { /*TO DO: need to consider (RSSI) */
bTryUp = true; bTryUp = true;
} }
} else if (priv->CurrentOperaRate == 11) { } else if (priv->CurrentOperaRate == 11) {
...@@ -718,7 +716,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -718,7 +716,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
if (priv->CurrentOperaRate == 36) { if (priv->CurrentOperaRate == 36) {
priv->bUpdateARFR = true; priv->bUpdateARFR = true;
write_nic_word(dev, ARFR, 0x0F8F); /* bypass 12/9/6 */ write_nic_word(dev, ARFR, 0x0F8F); /* bypass 12/9/6 */
} else if(priv->bUpdateARFR) { } else if (priv->bUpdateARFR) {
priv->bUpdateARFR = false; priv->bUpdateARFR = false;
write_nic_word(dev, ARFR, 0x0FFF); /* set 1M ~ 54Mbps. */ write_nic_word(dev, ARFR, 0x0FFF); /* set 1M ~ 54Mbps. */
} }
...@@ -732,7 +730,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -732,7 +730,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
} }
} else { } else {
if (priv->TryupingCount > 0) if (priv->TryupingCount > 0)
priv->TryupingCount --; priv->TryupingCount--;
} }
if (bTryDown) { if (bTryDown) {
...@@ -757,7 +755,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -757,7 +755,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
priv->CurrentOperaRate = GetDegradeTxRate(dev, priv->CurrentOperaRate); priv->CurrentOperaRate = GetDegradeTxRate(dev, priv->CurrentOperaRate);
/* Reduce chariot training time at weak signal strength situation. SD3 ED demand. */ /* Reduce chariot training time at weak signal strength situation. SD3 ED demand. */
if ((CurrSignalStrength < -80) && (priv->CurrentOperaRate > 72 )) { if ((CurrSignalStrength < -80) && (priv->CurrentOperaRate > 72)) {
priv->CurrentOperaRate = 72; priv->CurrentOperaRate = 72;
} }
...@@ -803,14 +801,14 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -803,14 +801,14 @@ void StaRateAdaptive87SE(struct net_device *dev)
if (u1bCck == CckTxPwrIdx) { if (u1bCck == CckTxPwrIdx) {
if (u1bOfdm != (OfdmTxPwrIdx + 2)) { if (u1bOfdm != (OfdmTxPwrIdx + 2)) {
priv->bEnhanceTxPwr = true; priv->bEnhanceTxPwr = true;
u1bOfdm = ((u1bOfdm + 2) > 35) ? 35: (u1bOfdm + 2); u1bOfdm = ((u1bOfdm + 2) > 35) ? 35 : (u1bOfdm + 2);
write_nic_byte(dev, OFDM_TXAGC, u1bOfdm); write_nic_byte(dev, OFDM_TXAGC, u1bOfdm);
} }
} else if (u1bCck < CckTxPwrIdx) { } else if (u1bCck < CckTxPwrIdx) {
/* case 2: enter high power */ /* case 2: enter high power */
if (!priv->bEnhanceTxPwr) { if (!priv->bEnhanceTxPwr) {
priv->bEnhanceTxPwr = true; priv->bEnhanceTxPwr = true;
u1bOfdm = ((u1bOfdm + 2) > 35) ? 35: (u1bOfdm + 2); u1bOfdm = ((u1bOfdm + 2) > 35) ? 35 : (u1bOfdm + 2);
write_nic_byte(dev, OFDM_TXAGC, u1bOfdm); write_nic_byte(dev, OFDM_TXAGC, u1bOfdm);
} }
} }
...@@ -826,7 +824,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -826,7 +824,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
/* case 2: enter high power */ /* case 2: enter high power */
else if (u1bCck < CckTxPwrIdx) { else if (u1bCck < CckTxPwrIdx) {
priv->bEnhanceTxPwr = false; priv->bEnhanceTxPwr = false;
u1bOfdm = ((u1bOfdm - 2) > 0) ? (u1bOfdm - 2): 0; u1bOfdm = ((u1bOfdm - 2) > 0) ? (u1bOfdm - 2) : 0;
write_nic_byte(dev, OFDM_TXAGC, u1bOfdm); write_nic_byte(dev, OFDM_TXAGC, u1bOfdm);
} }
} }
...@@ -851,7 +849,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -851,7 +849,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
else else
priv->InitialGain--; priv->InitialGain--;
printk("StaRateAdaptive87SE(): update init_gain to index %d for date rate %d\n",priv->InitialGain, priv->CurrentOperaRate); printk("StaRateAdaptive87SE(): update init_gain to index %d for date rate %d\n", priv->InitialGain, priv->CurrentOperaRate);
UpdateInitialGain(dev); UpdateInitialGain(dev);
} }
} else { /* OFDM */ } else { /* OFDM */
...@@ -859,7 +857,7 @@ void StaRateAdaptive87SE(struct net_device *dev) ...@@ -859,7 +857,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
priv->InitialGainBackUp = priv->InitialGain; priv->InitialGainBackUp = priv->InitialGain;
priv->InitialGain++; priv->InitialGain++;
printk("StaRateAdaptive87SE(): update init_gain to index %d for date rate %d\n",priv->InitialGain, priv->CurrentOperaRate); printk("StaRateAdaptive87SE(): update init_gain to index %d for date rate %d\n", priv->InitialGain, priv->CurrentOperaRate);
UpdateInitialGain(dev); UpdateInitialGain(dev);
} }
} }
...@@ -943,7 +941,7 @@ bool SetAntenna8185(struct net_device *dev, u8 u1bAntennaIndex) ...@@ -943,7 +941,7 @@ bool SetAntenna8185(struct net_device *dev, u8 u1bAntennaIndex)
break; break;
} }
if(bAntennaSwitched) if (bAntennaSwitched)
priv->CurrAntennaIndex = u1bAntennaIndex; priv->CurrAntennaIndex = u1bAntennaIndex;
return bAntennaSwitched; return bAntennaSwitched;
...@@ -1000,8 +998,8 @@ void SwAntennaDiversity(struct net_device *dev) ...@@ -1000,8 +998,8 @@ void SwAntennaDiversity(struct net_device *dev)
priv->AdRxSsThreshold = (priv->AdRxSignalStrength + priv->AdRxSsBeforeSwitched) / 2; priv->AdRxSsThreshold = (priv->AdRxSignalStrength + priv->AdRxSsBeforeSwitched) / 2;
priv->AdRxSsThreshold = (priv->AdRxSsThreshold > priv->AdMaxRxSsThreshold) ? priv->AdRxSsThreshold = (priv->AdRxSsThreshold > priv->AdMaxRxSsThreshold) ?
priv->AdMaxRxSsThreshold: priv->AdRxSsThreshold; priv->AdMaxRxSsThreshold : priv->AdRxSsThreshold;
if(priv->AdRxSignalStrength < priv->AdRxSsBeforeSwitched) { if (priv->AdRxSignalStrength < priv->AdRxSsBeforeSwitched) {
/* Rx signal strength is not improved after we swtiched antenna. => Swich back. */ /* Rx signal strength is not improved after we swtiched antenna. => Swich back. */
/* Increase Antenna Diversity checking period due to bad decision. */ /* Increase Antenna Diversity checking period due to bad decision. */
priv->AdCheckPeriod *= 2; priv->AdCheckPeriod *= 2;
...@@ -1083,7 +1081,7 @@ void SwAntennaDiversity(struct net_device *dev) ...@@ -1083,7 +1081,7 @@ void SwAntennaDiversity(struct net_device *dev)
priv->AdRxSsThreshold = (priv->AdRxSsThreshold + priv->AdRxSignalStrength) / 2; priv->AdRxSsThreshold = (priv->AdRxSsThreshold + priv->AdRxSignalStrength) / 2;
priv->AdRxSsThreshold = (priv->AdRxSsThreshold > priv->AdMaxRxSsThreshold) ? priv->AdRxSsThreshold = (priv->AdRxSsThreshold > priv->AdMaxRxSsThreshold) ?
priv->AdMaxRxSsThreshold: priv->AdRxSsThreshold;/* +by amy 080312 */ priv->AdMaxRxSsThreshold : priv->AdRxSsThreshold;/* +by amy 080312 */
} }
/* Reduce Antenna Diversity checking period if possible. */ /* Reduce Antenna Diversity checking period if possible. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7