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

Commit 7c51d17c authored by Kees Cook's avatar Kees Cook Committed by Kalle Valo
Browse files

rtlwifi: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Chaoming Li <chaoming_li@realsil.com.cn>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: Souptick Joarder <jrdr.linux@gmail.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5e5c79b2

drivers/net/wireless/realtek/rtlwifi/base.c

+10 −10
Original line number Diff line number Diff line
@@ -457,10 +457,10 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);



	/* <1> timer */

	setup_timer(&rtlpriv->works.watchdog_timer,

		    rtl_watch_dog_timer_callback, (unsigned long)hw);

	setup_timer(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,

		    rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw);

	timer_setup(&rtlpriv->works.watchdog_timer,

		    rtl_watch_dog_timer_callback, 0);

	timer_setup(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,

		    rtl_easy_concurrent_retrytimer_callback, 0);

	/* <2> work queue */

	rtlpriv->works.hw = hw;

	rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
@@ -2057,10 +2057,9 @@ void rtl_watchdog_wq_callback(void *data) 
	rtl_scan_list_expire(hw);

}



void rtl_watch_dog_timer_callback(unsigned long data)

void rtl_watch_dog_timer_callback(struct timer_list *t)

{

	struct ieee80211_hw *hw = (struct ieee80211_hw *)data;

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_priv *rtlpriv = from_timer(rtlpriv, t, works.watchdog_timer);



	queue_delayed_work(rtlpriv->works.rtl_wq,

			   &rtlpriv->works.watchdog_wq, 0);
@@ -2166,10 +2165,11 @@ void rtl_c2hcmd_wq_callback(void *data) 
	rtl_c2hcmd_launcher(hw, 1);

}



void rtl_easy_concurrent_retrytimer_callback(unsigned long data)

void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t)

{

	struct ieee80211_hw *hw = (struct ieee80211_hw *)data;

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_priv *rtlpriv =

		from_timer(rtlpriv, t, works.dualmac_easyconcurrent_retrytimer);

	struct ieee80211_hw *hw = rtlpriv->hw;

	struct rtl_priv *buddy_priv = rtlpriv->buddy_priv;



	if (buddy_priv == NULL)

drivers/net/wireless/realtek/rtlwifi/base.h

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void rtl_init_rx_config(struct ieee80211_hw *hw); 
void rtl_init_rfkill(struct ieee80211_hw *hw);

void rtl_deinit_rfkill(struct ieee80211_hw *hw);



void rtl_watch_dog_timer_callback(unsigned long data);

void rtl_watch_dog_timer_callback(struct timer_list *t);

void rtl_deinit_deferred_work(struct ieee80211_hw *hw);



bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
@@ -173,7 +173,7 @@ int rtl_send_smps_action(struct ieee80211_hw *hw, 
u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);

void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);

u8 rtl_tid_to_ac(u8 tid);

void rtl_easy_concurrent_retrytimer_callback(unsigned long data);

void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t);

extern struct rtl_global_var rtl_global_var;

void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);

drivers/net/wireless/realtek/rtlwifi/core.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int rtl_op_start(struct ieee80211_hw *hw) 
	mutex_lock(&rtlpriv->locks.conf_mutex);

	err = rtlpriv->intf_ops->adapter_start(hw);

	if (!err)

		rtl_watch_dog_timer_callback((unsigned long)hw);

		rtl_watch_dog_timer_callback(&rtlpriv->works.watchdog_timer);

	mutex_unlock(&rtlpriv->locks.conf_mutex);

	return err;

}

drivers/net/wireless/realtek/rtlwifi/ps.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw) 
	rtlpriv->cfg->ops->enable_interrupt(hw);



	/*<enable timer> */

	rtl_watch_dog_timer_callback((unsigned long)hw);

	rtl_watch_dog_timer_callback(&rtlpriv->works.watchdog_timer);



	return true;

}

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c

+4 −2
Original line number Diff line number Diff line
@@ -1708,9 +1708,11 @@ static void rtl88e_dm_fast_ant_training(struct ieee80211_hw *hw) 
	}

}



void rtl88e_dm_fast_antenna_training_callback(unsigned long data)

void rtl88e_dm_fast_antenna_training_callback(struct timer_list *t)

{

	struct ieee80211_hw *hw = (struct ieee80211_hw *)data;

	struct rtl_priv *rtlpriv =

		from_timer(rtlpriv, t, works.fast_antenna_training_timer);

	struct ieee80211_hw *hw = rtlpriv->hw;



	rtl88e_dm_fast_ant_training(hw);

}