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

Commit 61383412 authored by Geliang Tang's avatar Geliang Tang Committed by Kalle Valo
Browse files

wlcore: use to_delayed_work() 



Use to_delayed_work() instead of open-coding it.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
[Update commit message]
Signed-off-by: default avatarJulian Calaby <julian.calaby@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ea544aab

drivers/net/wireless/ti/wlcore/main.c

+5 −5
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void wl12xx_tx_watchdog_work(struct work_struct *work) 
	struct delayed_work *dwork;

	struct wl1271 *wl;



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

	dwork = to_delayed_work(work);

	wl = container_of(dwork, struct wl1271, tx_watchdog_work);



	mutex_lock(&wl->mutex);
@@ -2011,7 +2011,7 @@ static void wlcore_channel_switch_work(struct work_struct *work) 
	struct wl12xx_vif *wlvif;

	int ret;



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

	dwork = to_delayed_work(work);

	wlvif = container_of(dwork, struct wl12xx_vif, channel_switch_work);

	wl = wlvif->wl;
@@ -2047,7 +2047,7 @@ static void wlcore_connection_loss_work(struct work_struct *work) 
	struct ieee80211_vif *vif;

	struct wl12xx_vif *wlvif;



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

	dwork = to_delayed_work(work);

	wlvif = container_of(dwork, struct wl12xx_vif, connection_loss_work);

	wl = wlvif->wl;
@@ -2076,7 +2076,7 @@ static void wlcore_pending_auth_complete_work(struct work_struct *work) 
	unsigned long time_spare;

	int ret;



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

	dwork = to_delayed_work(work);

	wlvif = container_of(dwork, struct wl12xx_vif,

			     pending_auth_complete_work);

	wl = wlvif->wl;
@@ -5588,7 +5588,7 @@ static void wlcore_roc_complete_work(struct work_struct *work) 
	struct wl1271 *wl;

	int ret;



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

	dwork = to_delayed_work(work);

	wl = container_of(dwork, struct wl1271, roc_complete_work);



	ret = wlcore_roc_completed(wl);

drivers/net/wireless/ti/wlcore/ps.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void wl1271_elp_work(struct work_struct *work) 
	struct wl12xx_vif *wlvif;

	int ret;



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

	dwork = to_delayed_work(work);

	wl = container_of(dwork, struct wl1271, elp_work);



	wl1271_debug(DEBUG_PSM, "elp work");

drivers/net/wireless/ti/wlcore/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void wl1271_scan_complete_work(struct work_struct *work) 
	struct wl12xx_vif *wlvif;

	int ret;



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

	dwork = to_delayed_work(work);

	wl = container_of(dwork, struct wl1271, scan_complete_work);



	wl1271_debug(DEBUG_SCAN, "Scanning complete");