rtlwifi: rtl8723ae: Convert driver to use new rtl_phy_scan_operation_backup() routine
Now that rtl_phy_scan_operation_backup() exists, convert rtl8723ae to use it. Routine rtl8723ae_phy_scan_operation_backup() is no longer used and is removed. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
6483033ad8
commit
3fc0165657
|
@ -934,35 +934,6 @@ static long _phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
|
|||
return pwrout_dbm;
|
||||
}
|
||||
|
||||
void rtl8723ae_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
|
||||
{
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
|
||||
enum io_type iotype;
|
||||
|
||||
if (!is_hal_stop(rtlhal)) {
|
||||
switch (operation) {
|
||||
case SCAN_OPT_BACKUP:
|
||||
iotype = IO_CMD_PAUSE_DM_BY_SCAN;
|
||||
rtlpriv->cfg->ops->set_hw_reg(hw,
|
||||
HW_VAR_IO_CMD,
|
||||
(u8 *)&iotype);
|
||||
|
||||
break;
|
||||
case SCAN_OPT_RESTORE:
|
||||
iotype = IO_CMD_RESUME_DM_BY_SCAN;
|
||||
rtlpriv->cfg->ops->set_hw_reg(hw,
|
||||
HW_VAR_IO_CMD,
|
||||
(u8 *)&iotype);
|
||||
break;
|
||||
default:
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
"Unknown Scan Backup operation.\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
|
|
|
@ -205,8 +205,6 @@ extern void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw,
|
|||
u8 channel);
|
||||
extern bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw,
|
||||
long power_indbm);
|
||||
extern void rtl8723ae_phy_scan_operation_backup(struct ieee80211_hw *hw,
|
||||
u8 operation);
|
||||
extern void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
|
||||
extern void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw,
|
||||
enum nl80211_channel_type ch_type);
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
#include "../core.h"
|
||||
#include "../pci.h"
|
||||
#include "../base.h"
|
||||
#include "reg.h"
|
||||
#include "def.h"
|
||||
#include "phy.h"
|
||||
|
@ -220,7 +221,7 @@ static struct rtl_hal_ops rtl8723ae_hal_ops = {
|
|||
.set_bw_mode = rtl8723ae_phy_set_bw_mode,
|
||||
.switch_channel = rtl8723ae_phy_sw_chnl,
|
||||
.dm_watchdog = rtl8723ae_dm_watchdog,
|
||||
.scan_operation_backup = rtl8723ae_phy_scan_operation_backup,
|
||||
.scan_operation_backup = rtl_phy_scan_operation_backup,
|
||||
.set_rf_power_state = rtl8723ae_phy_set_rf_power_state,
|
||||
.led_control = rtl8723ae_led_control,
|
||||
.set_desc = rtl8723ae_set_desc,
|
||||
|
|
Loading…
Reference in New Issue