Skip to content

Commit

Permalink
staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
Browse files Browse the repository at this point in the history
This patch renames the following variables:
'dwRegRead' into 'reg'
'rtStatus'  into 'status'

This is done primarily to reduce line length below 80 chars,
since the size and the usage of dwRegRead variable
can be deduced by its type and the function called
to assign it, so it can be replaced by simply 'reg'.
Also, rtStatus is not more informative than just status
in the given context.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Xenia Ragiadakou authored and Greg Kroah-Hartman committed Jun 24, 2013
1 parent 08a4cde commit a60d4d6
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/staging/rtl8192u/r819xU_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
RF90_RADIO_PATH_E eRFPath)
{
u8 ret = 0;
u32 i, CheckTimes = 4, dwRegRead = 0;
u32 i, CheckTimes = 4, reg = 0;
u32 WriteAddr[4];
u32 WriteData[] = {0xfffff027, 0xaa55a02f, 0x00000027, 0x55aa502f};
/* Initialize register address offset to be checked */
Expand All @@ -731,7 +731,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
case HW90_BLOCK_PHY1:
write_nic_dword(dev, WriteAddr[CheckBlock],
WriteData[i]);
read_nic_dword(dev, WriteAddr[CheckBlock], &dwRegRead);
read_nic_dword(dev, WriteAddr[CheckBlock], &reg);
break;

case HW90_BLOCK_RF:
Expand All @@ -742,9 +742,9 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
/* TODO: we should not delay for such a long time.
Ask SD3 */
msleep(1);
dwRegRead = rtl8192_phy_QueryRFReg(dev, eRFPath,
WriteAddr[HW90_BLOCK_RF],
bMask12Bits);
reg = rtl8192_phy_QueryRFReg(dev, eRFPath,
WriteAddr[HW90_BLOCK_RF],
bMask12Bits);
msleep(1);
break;

Expand All @@ -755,10 +755,10 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,


/* Check whether readback data is correct */
if (dwRegRead != WriteData[i]) {
if (reg != WriteData[i]) {
RT_TRACE((COMP_PHY|COMP_ERR),
"error dwRegRead: %x, WriteData: %x\n",
dwRegRead, WriteData[i]);
"error reg: %x, WriteData: %x\n",
reg, WriteData[i]);
ret = 1;
break;
}
Expand All @@ -779,7 +779,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
void rtl8192_BB_Config_ParaFile(struct net_device *dev)
{
struct r8192_priv *priv = ieee80211_priv(dev);
u8 reg_u8 = 0, eCheckItem = 0, rtStatus = 0;
u8 reg_u8 = 0, eCheckItem = 0, status = 0;
u32 reg_u32 = 0;
/**************************************
* <1> Initialize BaseBand
Expand All @@ -798,9 +798,9 @@ void rtl8192_BB_Config_ParaFile(struct net_device *dev)
for (eCheckItem = (HW90_BLOCK_E)HW90_BLOCK_PHY0;
eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) {
/* don't care RF path */
rtStatus = rtl8192_phy_checkBBAndRF(dev, (HW90_BLOCK_E)eCheckItem,
(RF90_RADIO_PATH_E)0);
if (rtStatus != 0) {
status = rtl8192_phy_checkBBAndRF(dev, (HW90_BLOCK_E)eCheckItem,
(RF90_RADIO_PATH_E)0);
if (status != 0) {
RT_TRACE((COMP_ERR | COMP_PHY),
"PHY_RF8256_Config(): Check PHY%d Fail!!\n",
eCheckItem-1);
Expand Down

0 comments on commit a60d4d6

Please sign in to comment.