aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-08-22 19:28:46 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-24 18:17:24 -0400
commit58637c9b65300cbdf9fb7c037978daadd136be86 (patch)
tree90f55e897d87036ea04097defe85dc43f1047ac6 /drivers/nfc
parent474fee3db16c63bc440bfb93b57f72ecfc4246f0 (diff)
NFC: Don't use WQ_MEM_RECLAIM for pn533
NFC driver doesn't sit in memory reclaim path and has no reason to use WQ_MEM_RECLAIM. Drop WQ_MEM_RECLAIM from pn533->wq and use alloc_ordered_workqueue() instead of WQ_UNBOUND w/ max_active == 1. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 7ceea111439b..d123444404c8 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -2394,9 +2394,7 @@ static int pn533_probe(struct usb_interface *interface,
2394 INIT_WORK(&dev->mi_work, pn533_wq_mi_recv); 2394 INIT_WORK(&dev->mi_work, pn533_wq_mi_recv);
2395 INIT_WORK(&dev->tg_work, pn533_wq_tg_get_data); 2395 INIT_WORK(&dev->tg_work, pn533_wq_tg_get_data);
2396 INIT_WORK(&dev->poll_work, pn533_wq_poll); 2396 INIT_WORK(&dev->poll_work, pn533_wq_poll);
2397 dev->wq = alloc_workqueue("pn533", 2397 dev->wq = alloc_ordered_workqueue("pn533", 0);
2398 WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,
2399 1);
2400 if (dev->wq == NULL) 2398 if (dev->wq == NULL)
2401 goto error; 2399 goto error;
2402 2400