From: Tejun Heo <tj@kernel.org>
Date: Tue, 21 Aug 2012 20:18:24 +0000 (-0700)
Subject: workqueue: use mod_delayed_work() instead of __cancel + queue
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~52^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c2f967445dd2041f0f8e3179cca22bb8bb7f79;p=pandora-kernel.git

workqueue: use mod_delayed_work() instead of __cancel + queue

Now that mod_delayed_work() is safe to call from IRQ handlers,
__cancel_delayed_work() followed by queue_delayed_work() can be
replaced with mod_delayed_work().

Most conversions are straight-forward except for the following.

* net/core/link_watch.c: linkwatch_schedule_work() was doing a quite
  elaborate dancing around its delayed_work.  Collapse it such that
  linkwatch_work is queued for immediate execution if LW_URGENT and
  existing timer is kept otherwise.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
---

Reading git-diff-tree failed