evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mISDN: don't use flush_scheduled_work()

Browse source 
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush ch->workq when freeing channel and cancel it on
release.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
This commit is contained in:
Tejun Heo 2010-12-24 15:59:07 +01:00
parent d9c612eb6e
commit 0d26aa704e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/isdn/mISDN/hwchannel.c
View file

@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch)
} }
skb_queue_purge(&ch->squeue); skb_queue_purge(&ch->squeue);
skb_queue_purge(&ch->rqueue); skb_queue_purge(&ch->rqueue);
flush_scheduled_work(); flush_work_sync(&ch->workq);
return 0; return 0;
} }
EXPORT_SYMBOL(mISDN_freedchannel); EXPORT_SYMBOL(mISDN_freedchannel);
@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch)
mISDN_clear_bchannel(ch); mISDN_clear_bchannel(ch);
skb_queue_purge(&ch->rqueue); skb_queue_purge(&ch->rqueue);
ch->rcount = 0; ch->rcount = 0;
flush_scheduled_work(); flush_work_sync(&ch->workq);
return 0; return 0;
} }
EXPORT_SYMBOL(mISDN_freebchannel); EXPORT_SYMBOL(mISDN_freebchannel);

2
drivers/isdn/mISDN/l1oip_core.c
View file

@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc)
if (timer_pending(&hc->timeout_tl)) if (timer_pending(&hc->timeout_tl))
del_timer(&hc->timeout_tl); del_timer(&hc->timeout_tl);
cancel_work_sync(&hc->workq);
if (hc->socket_thread) if (hc->socket_thread)
l1oip_socket_close(hc); l1oip_socket_close(hc);