Commit 0290e7d0 authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo

rtl8xxxu: convert rtl8723bu_init_bt() into rtl8723b_enable_rf()

rtl8723bu_init_bt() is effectively the function enabling RF, so name
it appropriately.
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6979494a
...@@ -1596,10 +1596,6 @@ static void rtl8723a_enable_rf(struct rtl8xxxu_priv *priv) ...@@ -1596,10 +1596,6 @@ static void rtl8723a_enable_rf(struct rtl8xxxu_priv *priv)
rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00); rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
} }
static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv)
{
}
static void rtl8723a_disable_rf(struct rtl8xxxu_priv *priv) static void rtl8723a_disable_rf(struct rtl8xxxu_priv *priv)
{ {
u8 sps0; u8 sps0;
...@@ -5953,7 +5949,7 @@ static void rtl8723bu_set_ps_tdma(struct rtl8xxxu_priv *priv, ...@@ -5953,7 +5949,7 @@ static void rtl8723bu_set_ps_tdma(struct rtl8xxxu_priv *priv,
} }
#endif #endif
static void rtl8723bu_init_bt(struct rtl8xxxu_priv *priv) static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv)
{ {
struct h2c_cmd h2c; struct h2c_cmd h2c;
u32 val32; u32 val32;
...@@ -6508,10 +6504,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) ...@@ -6508,10 +6504,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
else else
rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_T_METER, 0x60); rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_T_METER, 0x60);
/* Init BT hw config. */
if (priv->fops->init_bt)
priv->fops->init_bt(priv);
/* Set NAV_UPPER to 30000us */ /* Set NAV_UPPER to 30000us */
val8 = ((30000 + NAV_UPPER_UNIT - 1) / NAV_UPPER_UNIT); val8 = ((30000 + NAV_UPPER_UNIT - 1) / NAV_UPPER_UNIT);
rtl8xxxu_write8(priv, REG_NAV_UPPER, val8); rtl8xxxu_write8(priv, REG_NAV_UPPER, val8);
...@@ -8300,7 +8292,6 @@ static struct rtl8xxxu_fileops rtl8723bu_fops = { ...@@ -8300,7 +8292,6 @@ static struct rtl8xxxu_fileops rtl8723bu_fops = {
.phy_init_antenna_selection = rtl8723bu_phy_init_antenna_selection, .phy_init_antenna_selection = rtl8723bu_phy_init_antenna_selection,
.phy_iq_calibrate = rtl8723bu_phy_iq_calibrate, .phy_iq_calibrate = rtl8723bu_phy_iq_calibrate,
.config_channel = rtl8723bu_config_channel, .config_channel = rtl8723bu_config_channel,
.init_bt = rtl8723bu_init_bt,
.parse_rx_desc = rtl8723bu_parse_rx_desc, .parse_rx_desc = rtl8723bu_parse_rx_desc,
.init_aggregation = rtl8723bu_init_aggregation, .init_aggregation = rtl8723bu_init_aggregation,
.init_statistics = rtl8723bu_init_statistics, .init_statistics = rtl8723bu_init_statistics,
......
...@@ -1261,7 +1261,6 @@ struct rtl8xxxu_fileops { ...@@ -1261,7 +1261,6 @@ struct rtl8xxxu_fileops {
void (*phy_init_antenna_selection) (struct rtl8xxxu_priv *priv); void (*phy_init_antenna_selection) (struct rtl8xxxu_priv *priv);
void (*phy_iq_calibrate) (struct rtl8xxxu_priv *priv); void (*phy_iq_calibrate) (struct rtl8xxxu_priv *priv);
void (*config_channel) (struct ieee80211_hw *hw); void (*config_channel) (struct ieee80211_hw *hw);
void (*init_bt) (struct rtl8xxxu_priv *priv);
int (*parse_rx_desc) (struct rtl8xxxu_priv *priv, struct sk_buff *skb, int (*parse_rx_desc) (struct rtl8xxxu_priv *priv, struct sk_buff *skb,
struct ieee80211_rx_status *rx_status); struct ieee80211_rx_status *rx_status);
void (*init_aggregation) (struct rtl8xxxu_priv *priv); void (*init_aggregation) (struct rtl8xxxu_priv *priv);
......
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