Commit b4cf24cc authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: rtl8188eu: refactor rtl88eu_dm_update_rx_idle_ant()

Refactor rtl88eu_dm_update_rx_idle_ant() to reduce indentation level
and clear line over 80 characters checkpatch warnings.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200105194936.5477-2-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c5e99c9
...@@ -154,35 +154,37 @@ void rtl88eu_dm_update_rx_idle_ant(struct odm_dm_struct *dm_odm, u8 ant) ...@@ -154,35 +154,37 @@ void rtl88eu_dm_update_rx_idle_ant(struct odm_dm_struct *dm_odm, u8 ant)
struct adapter *adapter = dm_odm->Adapter; struct adapter *adapter = dm_odm->Adapter;
u32 default_ant, optional_ant; u32 default_ant, optional_ant;
if (dm_fat_tbl->RxIdleAnt != ant) { if (dm_fat_tbl->RxIdleAnt == ant)
if (ant == MAIN_ANT) { return;
default_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
optional_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
} else {
default_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
optional_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
}
if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) { if (ant == MAIN_ANT) {
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N, default_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
BIT(5) | BIT(4) | BIT(3), default_ant); MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N, optional_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
BIT(8) | BIT(7) | BIT(6), optional_ant); AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
phy_set_bb_reg(adapter, ODM_REG_ANTSEL_CTRL_11N, } else {
BIT(14) | BIT(13) | BIT(12), default_ant); default_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
phy_set_bb_reg(adapter, ODM_REG_RESP_TX_11N, AUX_ANT_CG_TRX : AUX_ANT_CGCS_RX;
BIT(6) | BIT(7), default_ant); optional_ant = (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ?
} else if (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV) { MAIN_ANT_CG_TRX : MAIN_ANT_CGCS_RX;
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT(5) | BIT(4) | BIT(3), default_ant);
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT(8) | BIT(7) | BIT(6), optional_ant);
}
} }
if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV) {
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT(5) | BIT(4) | BIT(3), default_ant);
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT(8) | BIT(7) | BIT(6), optional_ant);
phy_set_bb_reg(adapter, ODM_REG_ANTSEL_CTRL_11N,
BIT(14) | BIT(13) | BIT(12), default_ant);
phy_set_bb_reg(adapter, ODM_REG_RESP_TX_11N,
BIT(6) | BIT(7), default_ant);
} else if (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV) {
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT(5) | BIT(4) | BIT(3), default_ant);
phy_set_bb_reg(adapter, ODM_REG_RX_ANT_CTRL_11N,
BIT(8) | BIT(7) | BIT(6), optional_ant);
}
dm_fat_tbl->RxIdleAnt = ant; dm_fat_tbl->RxIdleAnt = ant;
} }
......
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