staging: rtl8192e: Rename rtl8192_phy_setTxPower

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_setTxPower to rtl92e_set_tx_power.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index b389041db5bb1b3d374cd08e87e7118366171d89..8f3172e908d42bd63b6747fcf19ba5b7a1f78d0a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -832,7 +832,7 @@ start:
 
        if (priv->card_8192_version > (u8) VERSION_8190_BD) {
                rtl92e_get_tx_power(dev);
-               rtl8192_phy_setTxPower(dev, priv->chan);
+               rtl92e_set_tx_power(dev, priv->chan);
        }
 
        tmpvalue = read_nic_byte(dev, IC_VERRSION);

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 6ddbbfc29f4f250fb10fd5ea0ef3110dbff1b624..fbbf5346d76a67bd5671ccd2af1b582161c7a081 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -637,7 +637,7 @@ void rtl92e_get_tx_power(struct net_device *dev)
        priv->SifsTime = read_nic_word(dev, SIFS);
 }
 
-void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel)
+void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8      powerlevel = 0, powerlevelOFDM24G = 0;
@@ -1386,7 +1386,7 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
                                 "Scan BBInitialGainRestore 0xa0a is %x\n",
                                 priv->initgain_backup.cca);
 
-                       rtl8192_phy_setTxPower(dev,
+                       rtl92e_set_tx_power(dev,
                                         priv->rtllib->current_network.channel);
 
                        if (dm_digtable.dig_algorithm ==

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 33aa78a375d9b42045f17ecfe5ec1d324b3b3a2b..b474a2b1e01af6c6db9a0079f983e84b838b899a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -84,7 +84,7 @@ extern bool rtl92e_check_bb_and_rf(struct net_device *dev,
                                   enum rf90_radio_path eRFPath);
 extern bool rtl92e_config_bb(struct net_device *dev);
 extern void rtl92e_get_tx_power(struct net_device *dev);
-extern void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel);
+extern void rtl92e_set_tx_power(struct net_device *dev, u8 channel);
 extern bool rtl92e_config_phy(struct net_device *dev);
 extern void rtl8192_phy_updateInitGain(struct net_device *dev);
 extern u8 rtl92e_config_rf_path(struct net_device *dev,

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index de085477f2f6f55530bfa95255cd17e46fe7e5d2..fe8f29153ef5faa1223f19b8ff829912aacd1e21 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -2555,8 +2555,7 @@ static void dm_dynamic_txpower(struct net_device *dev)
                RT_TRACE(COMP_TXAGC, "SetTxPowerLevel8190()  channel = %d\n",
                         priv->rtllib->current_network.channel);
 
-               rtl8192_phy_setTxPower(dev,
-                                priv->rtllib->current_network.channel);
+               rtl92e_set_tx_power(dev, priv->rtllib->current_network.channel);
        }
        priv->bLastDTPFlag_High = priv->bDynamicTxHighPower;
        priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower;