Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3764eb72 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: Convert driver to use new rtl_phy_scan_operation_backup() routine 



Now that rtl_phy_scan_operation_backup() exists, convert rtl8192ce to use it.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5784935d

drivers/net/wireless/rtlwifi/rtl8192ce/phy.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -207,8 +207,6 @@ void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, 
void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);

void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel);

bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw,

bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw,

					  long power_indbm);

					  long power_indbm);

void rtl92c_phy_scan_operation_backup(struct ieee80211_hw *hw,

					     u8 operation);

void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw,

void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw,

				   enum nl80211_channel_type ch_type);

				   enum nl80211_channel_type ch_type);

void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw);

void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw);

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "../wifi.h"

#include "../wifi.h"

#include "../core.h"

#include "../core.h"

#include "../pci.h"

#include "../pci.h"

#include "../base.h"

#include "reg.h"

#include "reg.h"

#include "def.h"

#include "def.h"

#include "phy.h"

#include "phy.h"
@@ -219,7 +220,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { 
	.set_bw_mode = rtl92c_phy_set_bw_mode,

	.set_bw_mode = rtl92c_phy_set_bw_mode,

	.switch_channel = rtl92c_phy_sw_chnl,

	.switch_channel = rtl92c_phy_sw_chnl,

	.dm_watchdog = rtl92c_dm_watchdog,

	.dm_watchdog = rtl92c_dm_watchdog,

	.scan_operation_backup = rtl92c_phy_scan_operation_backup,

	.scan_operation_backup = rtl_phy_scan_operation_backup,

	.set_rf_power_state = rtl92c_phy_set_rf_power_state,

	.set_rf_power_state = rtl92c_phy_set_rf_power_state,

	.led_control = rtl92ce_led_control,

	.led_control = rtl92ce_led_control,

	.set_desc = rtl92ce_set_desc,

	.set_desc = rtl92ce_set_desc,