From 916082b073ebb7f4e064cebce0768e34cacde508 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 2 Oct 2012 16:01:31 -0700 Subject: workqueue: avoid using deprecated functions The network merge brought in a few users of functions that got deprecated by the workqueue cleanups: the 'system_nrt_wq' is now the same as the regular system_wq, since all workqueues are now non- reentrant. Similarly, remove one use of flush_work_sync() - the regular flush_work() has become synchronous, and the "_sync()" version is thus deprecated as being superfluous. Signed-off-by: Linus Torvalds --- net/nfc/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/nfc/core.c') diff --git a/net/nfc/core.c b/net/nfc/core.c index c9eacc1f145f..479bee36dc3e 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -715,7 +715,7 @@ static void nfc_check_pres_timeout(unsigned long data) { struct nfc_dev *dev = (struct nfc_dev *)data; - queue_work(system_nrt_wq, &dev->check_pres_work); + schedule_work(&dev->check_pres_work); } struct class nfc_class = { -- cgit v1.2.3