Commit a5959f3f authored by Geliang Tang's avatar Geliang Tang Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: use to_delayed_work 



Use to_delayed_work() instead of open-coding it.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79a5ccd9

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c

+3 −3
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ EXPORT_SYMBOL(ieee80211_softmac_scan_syncro); 


static void ieee80211_softmac_scan_wq(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work, struct delayed_work, work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq);

	static short watchdog;

	u8 channel_map[MAX_CHANNEL_NUMBER+1];
@@ -2330,7 +2330,7 @@ static void ieee80211_start_monitor_mode(struct ieee80211_device *ieee) 
static void ieee80211_start_ibss_wq(struct work_struct *work)

{



	struct delayed_work *dwork = container_of(work, struct delayed_work, work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq);

	/* iwconfig mode ad-hoc will schedule this and return

	 * on the other hand this will block further iwconfig SET
@@ -2504,7 +2504,7 @@ EXPORT_SYMBOL(ieee80211_disassociate); 


static void ieee80211_associate_retry_wq(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work, struct delayed_work, work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq);

	unsigned long flags;

drivers/staging/rtl8192u/r8192U_core.c

+1 −2
Original line number Diff line number Diff line
@@ -3436,8 +3436,7 @@ static void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum, 


static void rtl819x_watchdog_wqcallback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work,

						  struct delayed_work, work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct r8192_priv *priv = container_of(dwork,

					       struct r8192_priv, watch_dog_wq);

	struct net_device *dev = priv->ieee80211->dev;

drivers/staging/rtl8192u/r8192U_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) 


void dm_txpower_trackingcallback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work, struct delayed_work, work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq);

	struct net_device *dev = priv->ieee80211->dev;
@@ -2412,7 +2412,7 @@ static void dm_check_pbc_gpio(struct net_device *dev) 
 *---------------------------------------------------------------------------*/

void dm_rf_pathcheck_workitemcallback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work, struct delayed_work, work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct r8192_priv *priv = container_of(dwork, struct r8192_priv, rfpath_check_wq);

	struct net_device *dev = priv->ieee80211->dev;

	/*bool bactually_set = false;*/

drivers/staging/rtl8192u/r819xU_phy.c

+1 −2
Original line number Diff line number Diff line
@@ -1683,8 +1683,7 @@ void InitialGain819xUsb(struct net_device *dev, u8 Operation) 


void InitialGainOperateWorkItemCallBack(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work, struct delayed_work,

						  work);

	struct delayed_work *dwork = to_delayed_work(work);

	struct r8192_priv *priv = container_of(dwork, struct r8192_priv,

					       initialgain_operate_wq);

	struct net_device *dev = priv->ieee80211->dev;