1 files changed, 2 insertions, 19 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
index b681af3c7a35..c983d2fe147f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
@@ -1634,28 +1634,11 @@ void rtl8723be_set_qos(struct ieee80211_hw *hw, int aci)
         }
 }
 
-static void rtl8723be_clear_interrupt(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        u32 tmp;
-
-        tmp = rtl_read_dword(rtlpriv, REG_HISR);
-        rtl_write_dword(rtlpriv, REG_HISR, tmp);
-
-        tmp = rtl_read_dword(rtlpriv, REG_HISRE);
-        rtl_write_dword(rtlpriv, REG_HISRE, tmp);
-
-        tmp = rtl_read_dword(rtlpriv, REG_HSISR);
-        rtl_write_dword(rtlpriv, REG_HSISR, tmp);
-}
-
 void rtl8723be_enable_interrupt(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        rtl8723be_clear_interrupt(hw);/*clear it here first*/
-
         rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
         rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
         rtlpci->irq_enabled = true;
@@ -2139,8 +2122,8 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw,
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
 
-        /* set channel plan to world wide 13 */
-        rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
+        /* set channel plan from efuse */
+        rtlefuse->channel_plan = rtlefuse->eeprom_channelplan;
 
         if (rtlhal->oem_id == RT_CID_DEFAULT) {
                 /* Does this one have a Toshiba SMID from group 1? */