| Message ID | 1463532238-13135-1-git-send-email-xypron.glpk@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a81605b14942a408b7f465cf7197f79224aa4f94 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 05/17/2016 07:43 PM, Heinrich Schuchardt wrote: > Simplify _rtl92ee_phy_path_adda_on. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > 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 <Larry.Finger@lwfinger.net> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > Simplify _rtl92ee_phy_path_adda_on. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Thanks, 1 patch applied to wireless-drivers-next.git: a81605b14942 rtlwifi: rtl8192ee: simplify coding
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,
Simplify _rtl92ee_phy_path_adda_on. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)