lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unify flush_work/flush_work_keventd and rename it to cancel_work_sync

Browse Source 
flush_work(wq, work) doesn't need the first parameter, we can use cwq->wq
(this was possible from the very beginnig, I missed this).  So we can unify
flush_work_keventd and flush_work.

Also, rename flush_work() to cancel_work_sync() and fix all callers.
Perhaps this is not the best name, but "flush_work" is really bad.

(akpm: this is why the earlier patches bypassed maintainers)

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Auke Kok <auke-jan.h.kok@intel.com>,
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov
2007-05-09 02:34:22 -07:00
committed by Linus Torvalds
parent 5830c59021
commit 28e53bddf8
9 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/phy.c
View File

@@ -663,9 +663,9 @@ int phy_stop_interrupts(struct phy_device *phydev)
/*
* Finish any pending work; we might have been scheduled to be called
* from keventd ourselves, but flush_work_keventd() handles that.
* from keventd ourselves, but cancel_work_sync() handles that.
*/
flush_work_keventd(&phydev->phy_queue);
cancel_work_sync(&phydev->phy_queue);
free_irq(phydev->irq, phydev);