staging: rtl8192e: Rename read_nic_word

Use naming schema found in other rtlwifi devices.
Rename read_nic_word to rtl92e_readw.

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 4fa5f303ae36d07279fb47e5aeeef841333f0300..61b10694f4c71d75ef5eb06fc3b3b361b99a7464 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -2282,7 +2282,7 @@ void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb)
 bool rtl92e_is_rx_stuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       u16               RegRxCounter = read_nic_word(dev, 0x130);
+       u16               RegRxCounter = rtl92e_readw(dev, 0x130);
        bool              bStuck = false;
        static u8         rx_chk_cnt;
        u32             SlotIndex = 0, TotalRxStuckCount = 0;
@@ -2347,7 +2347,7 @@ bool rtl92e_is_tx_stuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        bool    bStuck = false;
-       u16     RegTxCounter = read_nic_word(dev, 0x128);
+       u16     RegTxCounter = rtl92e_readw(dev, 0x128);
 
        RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n",
                 __func__, RegTxCounter, priv->TxCounter);

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 42dd7ae70a46429899d556bb5acd4a42557a7f64..667f44f01c53c4bdd3905f5defb627b82e5907cb 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -632,7 +632,7 @@ void rtl92e_get_tx_power(struct net_device *dev)
        priv->framesyncC34 = rtl92e_readl(dev, rOFDM0_RxDetector2);
        RT_TRACE(COMP_INIT, "Default framesync (0x%x) = 0x%x\n",
                rOFDM0_RxDetector3, priv->framesync);
-       priv->SifsTime = read_nic_word(dev, SIFS);
+       priv->SifsTime = rtl92e_readw(dev, SIFS);
 }
 
 void rtl92e_set_tx_power(struct net_device *dev, u8 channel)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index f75597f3f01a3151590fc907f3c5a16a37845676..64a03f314b439db132d67f27985a7d0a74e53a78 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -120,7 +120,7 @@ u32 rtl92e_readl(struct net_device *dev, int x)
        return readl((u8 __iomem *)dev->mem_start + x);
 }
 
-u16 read_nic_word(struct net_device *dev, int x)
+u16 rtl92e_readw(struct net_device *dev, int x)
 {
        return readw((u8 __iomem *)dev->mem_start + x);
 }

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 895a66fde689b23097788d342a88eac87706ff88..5a7a54f9dc9b42c99420b1a3bce53c236b6cf69d 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -580,7 +580,7 @@ extern const struct ethtool_ops rtl819x_ethtool_ops;
 
 u8 rtl92e_readb(struct net_device *dev, int x);
 u32 rtl92e_readl(struct net_device *dev, int x);
-u16 read_nic_word(struct net_device *dev, int x);
+u16 rtl92e_readw(struct net_device *dev, int x);
 void write_nic_byte(struct net_device *dev, int x, u8 y);
 void write_nic_word(struct net_device *dev, int x, u16 y);
 void write_nic_dword(struct net_device *dev, int x, u32 y);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 614bf1387e404c32ca05d523ae4ff017241f1d43..5bbb390334aa39c8d09df94aa324e911c6d6d3ab 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -698,7 +698,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
                                continue;
                        }
 
-                       Avg_TSSI_Meas = read_nic_word(dev, Tssi_Mea_Value);
+                       Avg_TSSI_Meas = rtl92e_readw(dev, Tssi_Mea_Value);
 
                        if (Avg_TSSI_Meas == 0) {
                                write_nic_byte(dev, Pw_Track_Flag, 0);