lkml.org 
[lkml]   [2015]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 058/102] staging: rtl8192e: Rename read_nic_word
    Date
    Use naming schema found in other rtlwifi devices.
    Rename read_nic_word to rtl92e_readw.

    Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
    ---
    drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++--
    drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +-
    drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
    drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +-
    drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
    5 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    index 4fa5f30..61b1069 100644
    --- 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 42dd7ae..667f44f 100644
    --- 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 f75597f..64a03f3 100644
    --- 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 895a66f..5a7a54f 100644
    --- 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 614bf13..5bbb390 100644
    --- 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);
    --
    1.8.4.1


    \
     
     \ /
      Last update: 2015-07-19 20:01    [W:6.850 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site