Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / staging / rtl8187se / r8180_dm.c

diff --git a/drivers/staging/rtl8187se/r8180_dm.c b/drivers/staging/rtl8187se/r8180_dm.c
index d5a5f2089710d0a110b5f6473b01d375d939224c..2ccd2cb70face1c2ea6f0e53a87091c861acba98 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_dm.c
+++ b/drivers/staging/rtl8187se/r8180_dm.c
@@ -30,7 +30,7 @@ bool CheckHighPower(struct net_device *dev)
  *             and they are related to OFDM and MAC registers.
  *             So, we don't want to update it so frequently in per-Rx packet base.
  */
-void DoTxHighPower(struct net_device *dev)
+static void DoTxHighPower(struct net_device *dev)
 {
        struct r8180_priv *priv = ieee80211_priv(dev);
        u16                     HiPwrUpperTh = 0;
@@ -125,7 +125,7 @@ bool CheckDig(struct net_device *dev)
 /*
  *     Implementation of DIG for Zebra and Zebra2.
  */
-void DIG_Zebra(struct net_device *dev)
+static void DIG_Zebra(struct net_device *dev)
 {
        struct r8180_priv *priv = ieee80211_priv(dev);
        u16                     CCKFalseAlarm, OFDMFalseAlarm;
@@ -202,7 +202,7 @@ void DIG_Zebra(struct net_device *dev)
 /*
  *     Dispatch DIG implementation according to RF.
  */
-void DynamicInitGain(struct net_device *dev)
+static void DynamicInitGain(struct net_device *dev)
 {
        DIG_Zebra(dev);
 }
@@ -223,7 +223,7 @@ void rtl8180_hw_dig_wq(struct work_struct *work)
 
 }
 
-int IncludedInSupportedRates(struct r8180_priv *priv, u8 TxRate)
+static int IncludedInSupportedRates(struct r8180_priv *priv, u8 TxRate)
 {
        u8 rate_len;
        u8 rate_ex_len;
@@ -255,7 +255,7 @@ found_rate:
  *     Get the Tx rate one degree up form the input rate in the supported rates.
  *     Return the upgrade rate if it is successed, otherwise return the input rate.
  */
-u8 GetUpgradeTxRate(struct net_device *dev, u8 rate)
+static u8 GetUpgradeTxRate(struct net_device *dev, u8 rate)
 {
        struct r8180_priv *priv = ieee80211_priv(dev);
        u8                      UpRate;
@@ -315,7 +315,7 @@ u8 GetUpgradeTxRate(struct net_device *dev, u8 rate)
  *     Return the degrade rate if it is successed, otherwise return the input rate.
  */
 
-u8 GetDegradeTxRate(struct net_device *dev, u8 rate)
+static u8 GetDegradeTxRate(struct net_device *dev, u8 rate)
 {
        struct r8180_priv *priv = ieee80211_priv(dev);
        u8                      DownRate;
@@ -375,7 +375,7 @@ u8 GetDegradeTxRate(struct net_device *dev, u8 rate)
  *      CCK rate.
  */
 
-bool MgntIsCckRate(u16 rate)
+static bool MgntIsCckRate(u16 rate)
 {
        bool bReturn = false;
 
@@ -435,7 +435,7 @@ void TxPwrTracking87SE(struct net_device *dev)
        }
        priv->ThermalMeter = CurrentThermal;
 }
-void StaRateAdaptive87SE(struct net_device *dev)
+static void StaRateAdaptive87SE(struct net_device *dev)
 {
        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
        unsigned long   CurrTxokCnt;
@@ -665,7 +665,7 @@ void StaRateAdaptive87SE(struct net_device *dev)
        }
 
        if (bTryUp && bTryDown)
-       printk("StaRateAdaptive87B(): Tx Rate tried upping and downing simultaneously!\n");
+               printk("StaRateAdaptive87B(): Tx Rate tried upping and downing simultaneously!\n");
 
        /* 1 Test Upgrading Tx Rate
         * Sometimes the cause of the low throughput (high retry rate) is the compatibility between the AP and NIC.