aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core/mad.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-08-21 16:18:24 -0400
committerTejun Heo <tj@kernel.org>2012-08-21 16:18:24 -0400
commit136b5721d75a62a8f02c601c89122e32c1a85a84 (patch)
tree871be0290b244d7e171ee615faecd6b804c55f8e /drivers/infiniband/core/mad.c
parent57b30ae77bf00d2318df711ef9a4d2a9be0a3a2a (diff)
workqueue: deprecate __cancel_delayed_work()
Now that cancel_delayed_work() can be safely called from IRQ handlers, there's no reason to use __cancel_delayed_work(). Use cancel_delayed_work() instead of __cancel_delayed_work() and mark the latter deprecated. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Jens Axboe <axboe@kernel.dk> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Roland Dreier <roland@kernel.org> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/infiniband/core/mad.c')
-rw-r--r--drivers/infiniband/core/mad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index b5938147fc8..dc3fd1e8af0 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2004,7 +2004,7 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv)
2004 unsigned long delay; 2004 unsigned long delay;
2005 2005
2006 if (list_empty(&mad_agent_priv->wait_list)) { 2006 if (list_empty(&mad_agent_priv->wait_list)) {
2007 __cancel_delayed_work(&mad_agent_priv->timed_work); 2007 cancel_delayed_work(&mad_agent_priv->timed_work);
2008 } else { 2008 } else {
2009 mad_send_wr = list_entry(mad_agent_priv->wait_list.next, 2009 mad_send_wr = list_entry(mad_agent_priv->wait_list.next,
2010 struct ib_mad_send_wr_private, 2010 struct ib_mad_send_wr_private,