staging: rtl8188eu: Rework function ODM_AntennaDiversity_88E()

Rename CamelCase function name.
Remove unnecessary comments.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index bc891e9cf35d8bc2b6565b54934fbe88d515cd5e..7da7fd7f4b974dc1dee89e0b46db8fcee303dbe5 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -1275,7 +1275,7 @@ void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm)
                return;
        }
 
-       ODM_AntennaDiversity_88E(pDM_Odm);
+       rtl88eu_dm_antenna_diversity(pDM_Odm);
 }
 
 /* EDCA Turbo */

diff --git a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
index 4e390d90a0b65e3a5e91d9e25bc89c6ca00f3e6c..495d9eca07d46a3f9da7d5eee08c4617572548b2 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
@@ -331,7 +331,7 @@ static void rtl88eu_dm_hw_ant_div(struct odm_dm_struct *dm_odm)
        dig_table->RSSI_max = max_rssi;
 }
 
-void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)
+void rtl88eu_dm_antenna_diversity(struct odm_dm_struct *dm_odm)
 {
        struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;
        struct adapter *adapter = dm_odm->Adapter;
@@ -339,28 +339,35 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)
        if (!(dm_odm->SupportAbility & ODM_BB_ANT_DIV))
                return;
        if (!dm_odm->bLinked) {
-               ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_AntennaDiversity_88E(): No Link.\n"));
+               ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,
+                            ("ODM_AntennaDiversity_88E(): No Link.\n"));
                if (dm_fat_tbl->bBecomeLinked) {
-                       ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn off HW AntDiv\n"));
-                       phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 0);    /* RegC50[7]=1'b1               enable HW AntDiv */
-                       phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N, BIT15, 0); /* Enable CCK AntDiv */
+                       ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,
+                                    ("Need to Turn off HW AntDiv\n"));
+                       phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 0);
+                       phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N,
+                                      BIT15, 0);
                        if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV)
-                               phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N, BIT21, 0); /* Reg80c[21]=1'b0          from TX Reg */
+                               phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N,
+                                              BIT21, 0);
                        dm_fat_tbl->bBecomeLinked = dm_odm->bLinked;
                }
                return;
        } else {
                if (!dm_fat_tbl->bBecomeLinked) {
-                       ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn on HW AntDiv\n"));
-                       /* Because HW AntDiv is disabled before Link, we enable HW AntDiv after link */
-                       phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 1);    /* RegC50[7]=1'b1               enable HW AntDiv */
-                       phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N, BIT15, 1); /* Enable CCK AntDiv */
+                       ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,
+                                    ("Need to Turn on HW AntDiv\n"));
+                       phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 1);
+                       phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N,
+                                      BIT15, 1);
                        if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV)
-                               phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N, BIT21, 1); /* Reg80c[21]=1'b1          from TX Info */
+                               phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N,
+                                              BIT21, 1);
                        dm_fat_tbl->bBecomeLinked = dm_odm->bLinked;
                }
        }
-       if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))
+       if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ||
+           (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))
                rtl88eu_dm_hw_ant_div(dm_odm);
 }
 

diff --git a/drivers/staging/rtl8188eu/include/odm_RTL8188E.h b/drivers/staging/rtl8188eu/include/odm_RTL8188E.h
index 684947f4d4a2174a1dc7e63967709015d89994f0..eabef39a554cac6547245813c7d1efd169bd295a 100644 (file)
--- a/drivers/staging/rtl8188eu/include/odm_RTL8188E.h
+++ b/drivers/staging/rtl8188eu/include/odm_RTL8188E.h
@@ -31,7 +31,7 @@ void ODM_DIG_LowerBound_88E(struct odm_dm_struct *pDM_Odm);
 
 void rtl88eu_dm_antenna_div_init(struct odm_dm_struct *dm_odm);
 
-void ODM_AntennaDiversity_88E(struct odm_dm_struct *pDM_Odm);
+void rtl88eu_dm_antenna_diversity(struct odm_dm_struct *dm_odm);
 
 void rtl88eu_dm_set_tx_ant_by_tx_info(struct odm_dm_struct *dm_odm, u8 *desc,
                                      u8 mac_id);