aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/fb_defio.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-14 10:21:17 -0500
committerTejun Heo <tj@kernel.org>2010-12-15 04:56:11 -0500
commitafe2c511fb2d75f1515081ff1be15bd79cfe722d (patch)
tree28aa74e9e0c654a95bf3306101e10ac1d16919d1 /drivers/video/fb_defio.c
parent2d64672ed38721b7a3815009d79bfb90a1f34a17 (diff)
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/fb_defio.c')
-rw-r--r--drivers/video/fb_defio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 6b93ef93cb12..804000183c5e 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -75,7 +75,7 @@ int fb_deferred_io_fsync(struct file *file, int datasync)
75 return 0; 75 return 0;
76 76
77 /* Kill off the delayed work */ 77 /* Kill off the delayed work */
78 cancel_rearming_delayed_work(&info->deferred_work); 78 cancel_delayed_work_sync(&info->deferred_work);
79 79
80 /* Run it immediately */ 80 /* Run it immediately */
81 return schedule_delayed_work(&info->deferred_work, 0); 81 return schedule_delayed_work(&info->deferred_work, 0);