@@ -2572,8 +2572,7 @@ void rtl92ee_bt_hw_init(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- if (rtlpriv->cfg->ops->get_btc_status())
- rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+ rtl_btc(rtlpriv, rtlpriv->cfg->ops, btc_init_hw_config(rtlpriv));
}
void rtl92ee_suspend(struct ieee80211_hw *hw)
@@ -1767,9 +1767,7 @@ void rtl_8723e_c2h_command_handle(struct ieee80211_hw *hw)
rtl8723e_dm_bt_parse_bt_info(hw, ptmp_buf, c2h_event.cmd_len);
- if (rtlpriv->cfg->ops->get_btc_status())
- rtlpriv->btcoexist.btc_ops->btc_periodical(rtlpriv);
-
+ rtl_btc(rtlpriv, rtlpriv->cfg->ops, btc_periodical(rtlpriv));
break;
default:
break;
@@ -2419,8 +2419,7 @@ void rtl8723e_bt_hw_init(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- if (rtlpriv->cfg->ops->get_btc_status())
- rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+ rtl_btc(rtlpriv, rtlpriv->cfg->ops, btc_init_hw_config(rtlpriv));
}
void rtl8723e_suspend(struct ieee80211_hw *hw)
@@ -2719,8 +2719,7 @@ void rtl8723be_bt_hw_init(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- if (rtlpriv->cfg->ops->get_btc_status())
- rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+ rtl_btc(rtlpriv, rtlpriv->cfg->ops, btc_init_hw_config(rtlpriv));
}
@@ -1879,10 +1879,8 @@ void rtl8821ae_c2h_content_parsing(struct ieee80211_hw *hw,
case C2H_8812_BT_INFO:
RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
"[C2H], C2H_8812_BT_INFO!!\n");
- if (rtlpriv->cfg->ops->get_btc_status())
- rtlpriv->btcoexist.btc_ops->btc_btinfo_notify(rtlpriv,
- tmp_buf,
- c2h_cmd_len);
+ rtl_btc(rtlpriv, rtlpriv->cfg->ops,
+ btc_btinfo_notify(rtlpriv, tmp_buf, c2h_cmd_len));
break;
default:
break;
@@ -4012,8 +4012,7 @@ void rtl8821ae_bt_hw_init(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- if (rtlpriv->cfg->ops->get_btc_status())
- rtlpriv->btcoexist.btc_ops->btc_init_hw_config(rtlpriv);
+ rtl_btc(rtlpriv, rtlpriv->cfg->ops, btc_init_hw_config(rtlpriv));
}
void rtl8821ae_suspend(struct ieee80211_hw *hw)
Convert the uses of the btcoexist.<funcs> to the rtl_btc macro to save a few lines of code. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 3 +-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 4 +--- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 3 +-- drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 3 +-- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 6 ++---- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 3 +-- 6 files changed, 7 insertions(+), 15 deletions(-)