summaryrefslogtreecommitdiffstats
path: root/net/nfc/core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-02 16:01:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-02 16:01:31 -0700
commit916082b073ebb7f4e064cebce0768e34cacde508 (patch)
tree8a8037ebbaaffb2336ac4526a7f87ac9a22aeafd /net/nfc/core.c
parentaecdc33e111b2c447b622e287c6003726daa1426 (diff)
downloadlinux-916082b073ebb7f4e064cebce0768e34cacde508.tar.bz2
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 <torvalds@linux-foundation.org>
Diffstat (limited to 'net/nfc/core.c')
-rw-r--r--net/nfc/core.c2
1 files changed, 1 insertions, 1 deletions
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 = {