diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-09-26 14:25:33 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-03 16:40:02 -0400 |
commit | d41200ad5fc6c283c8c375f52e4f8699c0eeec61 (patch) | |
tree | ded90e635511ece563c4ce7809e9add437c0402e /drivers/net | |
parent | 3fc0165657592e98a957f348711209dd2c6c4f1c (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 28 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/phy.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 3 |
3 files changed, 2 insertions, 31 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c index e655c0473225..d67f9c731cc4 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | |||
@@ -1136,34 +1136,6 @@ void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel) | |||
1136 | &bw40_pwr[0], channel); | 1136 | &bw40_pwr[0], channel); |
1137 | } | 1137 | } |
1138 | 1138 | ||
1139 | void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation) | ||
1140 | { | ||
1141 | struct rtl_priv *rtlpriv = rtl_priv(hw); | ||
1142 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | ||
1143 | enum io_type iotype; | ||
1144 | |||
1145 | if (!is_hal_stop(rtlhal)) { | ||
1146 | switch (operation) { | ||
1147 | case SCAN_OPT_BACKUP: | ||
1148 | iotype = IO_CMD_PAUSE_DM_BY_SCAN; | ||
1149 | rtlpriv->cfg->ops->set_hw_reg(hw, | ||
1150 | HW_VAR_IO_CMD, | ||
1151 | (u8 *)&iotype); | ||
1152 | break; | ||
1153 | case SCAN_OPT_RESTORE: | ||
1154 | iotype = IO_CMD_RESUME_DM_BY_SCAN; | ||
1155 | rtlpriv->cfg->ops->set_hw_reg(hw, | ||
1156 | HW_VAR_IO_CMD, | ||
1157 | (u8 *)&iotype); | ||
1158 | break; | ||
1159 | default: | ||
1160 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | ||
1161 | "Unknown Scan Backup operation.\n"); | ||
1162 | break; | ||
1163 | } | ||
1164 | } | ||
1165 | } | ||
1166 | |||
1167 | void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw) | 1139 | void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw) |
1168 | { | 1140 | { |
1169 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1141 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h index f1acd6d27e44..d4545f06e185 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h | |||
@@ -217,8 +217,6 @@ extern void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); | |||
217 | extern void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, | 217 | extern void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, |
218 | long *powerlevel); | 218 | long *powerlevel); |
219 | extern void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); | 219 | extern void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); |
220 | extern void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw, | ||
221 | u8 operation); | ||
222 | extern void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw); | 220 | extern void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw); |
223 | extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, | 221 | extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, |
224 | enum nl80211_channel_type ch_type); | 222 | enum nl80211_channel_type ch_type); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c index c254693a1e6a..347af1e4f438 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "../wifi.h" | 30 | #include "../wifi.h" |
31 | #include "../core.h" | 31 | #include "../core.h" |
32 | #include "../pci.h" | 32 | #include "../pci.h" |
33 | #include "../base.h" | ||
33 | #include "reg.h" | 34 | #include "reg.h" |
34 | #include "def.h" | 35 | #include "def.h" |
35 | #include "phy.h" | 36 | #include "phy.h" |
@@ -244,7 +245,7 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = { | |||
244 | .set_bw_mode = rtl88e_phy_set_bw_mode, | 245 | .set_bw_mode = rtl88e_phy_set_bw_mode, |
245 | .switch_channel = rtl88e_phy_sw_chnl, | 246 | .switch_channel = rtl88e_phy_sw_chnl, |
246 | .dm_watchdog = rtl88e_dm_watchdog, | 247 | .dm_watchdog = rtl88e_dm_watchdog, |
247 | .scan_operation_backup = rtl88e_phy_scan_operation_backup, | 248 | .scan_operation_backup = rtl_phy_scan_operation_backup, |
248 | .set_rf_power_state = rtl88e_phy_set_rf_power_state, | 249 | .set_rf_power_state = rtl88e_phy_set_rf_power_state, |
249 | .led_control = rtl88ee_led_control, | 250 | .led_control = rtl88ee_led_control, |
250 | .set_desc = rtl88ee_set_desc, | 251 | .set_desc = rtl88ee_set_desc, |