summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap/lcd_mipid.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-14 16:21:17 +0100
committerTejun Heo <tj@kernel.org>2010-12-15 10:56:11 +0100
commitafe2c511fb2d75f1515081ff1be15bd79cfe722d (patch)
tree28aa74e9e0c654a95bf3306101e10ac1d16919d1 /drivers/video/omap/lcd_mipid.c
parentworkqueue: It is likely that WORKER_NOT_RUNNING is true (diff)
downloadlinux-afe2c511fb2d75f1515081ff1be15bd79cfe722d.tar.xz
linux-afe2c511fb2d75f1515081ff1be15bd79cfe722d.zip
workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()
cancel_rearming_delayed_work[queue]() has been superceded by cancel_delayed_work_sync() quite some time ago. Convert all the in-kernel users. The conversions are completely equivalent and trivial. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: "David S. Miller" <davem@davemloft.net> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Cc: Jeff Garzik <jgarzik@pobox.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: netdev@vger.kernel.org Cc: Anton Vorontsov <cbou@mail.ru> Cc: David Woodhouse <dwmw2@infradead.org> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Neil Brown <neilb@suse.de> Cc: Alex Elder <aelder@sgi.com> Cc: xfs-masters@oss.sgi.com Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: netfilter-devel@vger.kernel.org Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: linux-nfs@vger.kernel.org
Diffstat (limited to 'drivers/video/omap/lcd_mipid.c')
-rw-r--r--drivers/video/omap/lcd_mipid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 64dcc7439c99..90e3bdd1b7ab 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -396,7 +396,7 @@ static void mipid_esd_start_check(struct mipid_device *md)
static void mipid_esd_stop_check(struct mipid_device *md)
{
if (md->esd_check != NULL)
- cancel_rearming_delayed_workqueue(md->esd_wq, &md->esd_work);
+ cancel_delayed_work_sync(&md->esd_work);
}
static void mipid_esd_work(struct work_struct *work)