[PATCH] video: don't use flush_scheduled_work() in fb_defio

From: Tejun Heo
Date: Wed Jun 15 2011 - 12:00:38 EST


flush_scheduled_work() in on the way out. fb_deferred_io_cleanup()
can simply sync-cancel info->deferred_work instead of cancel +
flush_scheduled_work(). Drop flush_scheduled_work() usage.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
---
Compile tested. I'm planning on marking flush_scheduled_work()
deprecated in linux-next so it would be great if this can show up
there soonish. Thank you.

Resending because @intworks.biz bounced. Please update MAINTAINERS
with new email address.

drivers/video/fb_defio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Index: work/drivers/video/fb_defio.c
===================================================================
--- work.orig/drivers/video/fb_defio.c
+++ work/drivers/video/fb_defio.c
@@ -216,8 +216,7 @@ void fb_deferred_io_cleanup(struct fb_in
int i;

BUG_ON(!fbdefio);
- cancel_delayed_work(&info->deferred_work);
- flush_scheduled_work();
+ cancel_delayed_work_sync(&info->deferred_work);

/* clear out the mapping that we setup */
for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/