aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXenia Ragiadakou <burzalodowa@gmail.com>2013-06-22 23:15:17 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 19:08:33 -0400
commita60d4d6896fff32da512b233e0726a6423ff1562 (patch)
treea3f74548a0e3efb1cfd1cfda466e372afec46220
parent08a4cdea1956e60300b34b1cc324dc1ac256382b (diff)
staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
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>
-rw-r--r--drivers/staging/rtl8192u/r819xU_phy.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index bb67eca9773a..edb5df2c25f5 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -709,7 +709,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
709 RF90_RADIO_PATH_E eRFPath) 709 RF90_RADIO_PATH_E eRFPath)
710{ 710{
711 u8 ret = 0; 711 u8 ret = 0;
712 u32 i, CheckTimes = 4, dwRegRead = 0; 712 u32 i, CheckTimes = 4, reg = 0;
713 u32 WriteAddr[4]; 713 u32 WriteAddr[4];
714 u32 WriteData[] = {0xfffff027, 0xaa55a02f, 0x00000027, 0x55aa502f}; 714 u32 WriteData[] = {0xfffff027, 0xaa55a02f, 0x00000027, 0x55aa502f};
715 /* Initialize register address offset to be checked */ 715 /* Initialize register address offset to be checked */
@@ -731,7 +731,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
731 case HW90_BLOCK_PHY1: 731 case HW90_BLOCK_PHY1:
732 write_nic_dword(dev, WriteAddr[CheckBlock], 732 write_nic_dword(dev, WriteAddr[CheckBlock],
733 WriteData[i]); 733 WriteData[i]);
734 read_nic_dword(dev, WriteAddr[CheckBlock], &dwRegRead); 734 read_nic_dword(dev, WriteAddr[CheckBlock], &reg);
735 break; 735 break;
736 736
737 case HW90_BLOCK_RF: 737 case HW90_BLOCK_RF:
@@ -742,9 +742,9 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
742 /* TODO: we should not delay for such a long time. 742 /* TODO: we should not delay for such a long time.
743 Ask SD3 */ 743 Ask SD3 */
744 msleep(1); 744 msleep(1);
745 dwRegRead = rtl8192_phy_QueryRFReg(dev, eRFPath, 745 reg = rtl8192_phy_QueryRFReg(dev, eRFPath,
746 WriteAddr[HW90_BLOCK_RF], 746 WriteAddr[HW90_BLOCK_RF],
747 bMask12Bits); 747 bMask12Bits);
748 msleep(1); 748 msleep(1);
749 break; 749 break;
750 750
@@ -755,10 +755,10 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
755 755
756 756
757 /* Check whether readback data is correct */ 757 /* Check whether readback data is correct */
758 if (dwRegRead != WriteData[i]) { 758 if (reg != WriteData[i]) {
759 RT_TRACE((COMP_PHY|COMP_ERR), 759 RT_TRACE((COMP_PHY|COMP_ERR),
760 "error dwRegRead: %x, WriteData: %x\n", 760 "error reg: %x, WriteData: %x\n",
761 dwRegRead, WriteData[i]); 761 reg, WriteData[i]);
762 ret = 1; 762 ret = 1;
763 break; 763 break;
764 } 764 }
@@ -779,7 +779,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device *dev, HW90_BLOCK_E CheckBlock,
779void rtl8192_BB_Config_ParaFile(struct net_device *dev) 779void rtl8192_BB_Config_ParaFile(struct net_device *dev)
780{ 780{
781 struct r8192_priv *priv = ieee80211_priv(dev); 781 struct r8192_priv *priv = ieee80211_priv(dev);
782 u8 reg_u8 = 0, eCheckItem = 0, rtStatus = 0; 782 u8 reg_u8 = 0, eCheckItem = 0, status = 0;
783 u32 reg_u32 = 0; 783 u32 reg_u32 = 0;
784 /************************************** 784 /**************************************
785 * <1> Initialize BaseBand 785 * <1> Initialize BaseBand
@@ -798,9 +798,9 @@ void rtl8192_BB_Config_ParaFile(struct net_device *dev)
798 for (eCheckItem = (HW90_BLOCK_E)HW90_BLOCK_PHY0; 798 for (eCheckItem = (HW90_BLOCK_E)HW90_BLOCK_PHY0;
799 eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) { 799 eCheckItem <= HW90_BLOCK_PHY1; eCheckItem++) {
800 /* don't care RF path */ 800 /* don't care RF path */
801 rtStatus = rtl8192_phy_checkBBAndRF(dev, (HW90_BLOCK_E)eCheckItem, 801 status = rtl8192_phy_checkBBAndRF(dev, (HW90_BLOCK_E)eCheckItem,
802 (RF90_RADIO_PATH_E)0); 802 (RF90_RADIO_PATH_E)0);
803 if (rtStatus != 0) { 803 if (status != 0) {
804 RT_TRACE((COMP_ERR | COMP_PHY), 804 RT_TRACE((COMP_ERR | COMP_PHY),
805 "PHY_RF8256_Config(): Check PHY%d Fail!!\n", 805 "PHY_RF8256_Config(): Check PHY%d Fail!!\n",
806 eCheckItem-1); 806 eCheckItem-1);