2016-05-18 00:44:28

by Heinrich Schuchardt

Subject: [PATCH 1/1] rtlwifi: rtl8192ee: simplify coding

Simplify _rtl92ee_phy_path_adda_on.

Signed-off-by: Heinrich Schuchardt <[email protected]>
---
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
index 018340a..c2bf8d1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
@@ -2414,19 +2414,10 @@ static void _rtl92ee_phy_reload_mac_registers(struct ieee80211_hw *hw,
static void _rtl92ee_phy_path_adda_on(struct ieee80211_hw *hw, u32 *addareg,
bool is_patha_on, bool is2t)
{
- u32 pathon;
u32 i;

- pathon = is_patha_on ? 0x0fc01616 : 0x0fc01616;
- if (!is2t) {
- pathon = 0x0fc01616;
- rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0fc01616);
- } else {
- rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
- }
-
- for (i = 1; i < IQK_ADDA_REG_NUM; i++)
- rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathon);
+ for (i = 0; i < IQK_ADDA_REG_NUM; i++)
+ rtl_set_bbreg(hw, addareg[i], MASKDWORD, 0x0fc01616);
}

static void _rtl92ee_phy_mac_setting_calibration(struct ieee80211_hw *hw,
--
2.1.4

2016-05-18 12:02:57

by Larry Finger

Subject: Re: [PATCH 1/1] rtlwifi: rtl8192ee: simplify coding

On 05/17/2016 07:43 PM, Heinrich Schuchardt wrote:
> Simplify _rtl92ee_phy_path_adda_on.
>
> Signed-off-by: Heinrich Schuchardt <[email protected]>
> ---
> drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
> index 018340a..c2bf8d1 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
> @@ -2414,19 +2414,10 @@ static void _rtl92ee_phy_reload_mac_registers(struct ieee80211_hw *hw,
> static void _rtl92ee_phy_path_adda_on(struct ieee80211_hw *hw, u32 *addareg,
> bool is_patha_on, bool is2t)
> {
> - u32 pathon;
> u32 i;
>
> - pathon = is_patha_on ? 0x0fc01616 : 0x0fc01616;
> - if (!is2t) {
> - pathon = 0x0fc01616;
> - rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0fc01616);
> - } else {
> - rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
> - }
> -
> - for (i = 1; i < IQK_ADDA_REG_NUM; i++)
> - rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathon);
> + for (i = 0; i < IQK_ADDA_REG_NUM; i++)
> + rtl_set_bbreg(hw, addareg[i], MASKDWORD, 0x0fc01616);
> }
>
> static void _rtl92ee_phy_mac_setting_calibration(struct ieee80211_hw *hw,

Initially the thought was that addareg[0] would need to be set differently for
devices with 2 TX paths. For that reason, this routine was coded as shown. As
that assumption is no longer valid, this change should be made.

Acked-by: Larry Finger <[email protected]>

2016-06-14 14:23:04

by Kalle Valo

Subject: Re: [1/1] rtlwifi: rtl8192ee: simplify coding

Heinrich Schuchardt <[email protected]> wrote:
> Simplify _rtl92ee_phy_path_adda_on.
>
> Signed-off-by: Heinrich Schuchardt <[email protected]>
> Acked-by: Larry Finger <[email protected]>

Thanks, 1 patch applied to wireless-drivers-next.git:

a81605b14942 rtlwifi: rtl8192ee: simplify coding

--
Sent by pwcli
https://patchwork.kernel.org/patch/9115711/