rtlwifi: rtl8188ee: Convert driver to use new rtl_phy_scan_operation_backup() routine
Now that rtl_phy_scan_operation_backup() exists, convert rtl8188ee to use it. Routine rtl88e_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
3fc0165657
commit
d41200ad5f
|
@ -1136,34 +1136,6 @@ void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
|
|||
&bw40_pwr[0], channel);
|
||||
}
|
||||
|
||||
void rtl88e_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 rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
|
|
|
@ -217,8 +217,6 @@ extern void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw);
|
|||
extern void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw,
|
||||
long *powerlevel);
|
||||
extern void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);
|
||||
extern void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw,
|
||||
u8 operation);
|
||||
extern void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
|
||||
extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw,
|
||||
enum nl80211_channel_type ch_type);
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include "../wifi.h"
|
||||
#include "../core.h"
|
||||
#include "../pci.h"
|
||||
#include "../base.h"
|
||||
#include "reg.h"
|
||||
#include "def.h"
|
||||
#include "phy.h"
|
||||
|
@ -244,7 +245,7 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = {
|
|||
.set_bw_mode = rtl88e_phy_set_bw_mode,
|
||||
.switch_channel = rtl88e_phy_sw_chnl,
|
||||
.dm_watchdog = rtl88e_dm_watchdog,
|
||||
.scan_operation_backup = rtl88e_phy_scan_operation_backup,
|
||||
.scan_operation_backup = rtl_phy_scan_operation_backup,
|
||||
.set_rf_power_state = rtl88e_phy_set_rf_power_state,
|
||||
.led_control = rtl88ee_led_control,
|
||||
.set_desc = rtl88ee_set_desc,
|
||||
|
|
Loading…
Reference in New Issue