Commit 1c0a7c0e authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename read_nic_word

Use naming schema found in other rtlwifi devices.
Rename read_nic_word to rtl92e_readw.
Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99aa47e0
...@@ -2282,7 +2282,7 @@ void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb) ...@@ -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) bool rtl92e_is_rx_stuck(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u16 RegRxCounter = read_nic_word(dev, 0x130); u16 RegRxCounter = rtl92e_readw(dev, 0x130);
bool bStuck = false; bool bStuck = false;
static u8 rx_chk_cnt; static u8 rx_chk_cnt;
u32 SlotIndex = 0, TotalRxStuckCount = 0; u32 SlotIndex = 0, TotalRxStuckCount = 0;
...@@ -2347,7 +2347,7 @@ bool rtl92e_is_tx_stuck(struct net_device *dev) ...@@ -2347,7 +2347,7 @@ bool rtl92e_is_tx_stuck(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
bool bStuck = false; 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", RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n",
__func__, RegTxCounter, priv->TxCounter); __func__, RegTxCounter, priv->TxCounter);
......
...@@ -632,7 +632,7 @@ void rtl92e_get_tx_power(struct net_device *dev) ...@@ -632,7 +632,7 @@ void rtl92e_get_tx_power(struct net_device *dev)
priv->framesyncC34 = rtl92e_readl(dev, rOFDM0_RxDetector2); priv->framesyncC34 = rtl92e_readl(dev, rOFDM0_RxDetector2);
RT_TRACE(COMP_INIT, "Default framesync (0x%x) = 0x%x\n", RT_TRACE(COMP_INIT, "Default framesync (0x%x) = 0x%x\n",
rOFDM0_RxDetector3, priv->framesync); 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) void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
......
...@@ -120,7 +120,7 @@ u32 rtl92e_readl(struct net_device *dev, int x) ...@@ -120,7 +120,7 @@ u32 rtl92e_readl(struct net_device *dev, int x)
return readl((u8 __iomem *)dev->mem_start + 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); return readw((u8 __iomem *)dev->mem_start + x);
} }
......
...@@ -580,7 +580,7 @@ extern const struct ethtool_ops rtl819x_ethtool_ops; ...@@ -580,7 +580,7 @@ extern const struct ethtool_ops rtl819x_ethtool_ops;
u8 rtl92e_readb(struct net_device *dev, int x); u8 rtl92e_readb(struct net_device *dev, int x);
u32 rtl92e_readl(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_byte(struct net_device *dev, int x, u8 y);
void write_nic_word(struct net_device *dev, int x, u16 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); void write_nic_dword(struct net_device *dev, int x, u32 y);
......
...@@ -698,7 +698,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev) ...@@ -698,7 +698,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
continue; 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) { if (Avg_TSSI_Meas == 0) {
write_nic_byte(dev, Pw_Track_Flag, 0); write_nic_byte(dev, Pw_Track_Flag, 0);
......
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