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

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

[Tejun Heo]

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@kernel.org>
Cc: Jaya Kumar <jayakumar.lkml@gmail.com>
---
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) {

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

[Tejun Heo]

On Thu, Jun 16, 2011 at 03:56:18PM +0900, Paul Mundt wrote:
> >  drivers/video/fb_defio.c |    3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> I've applied it to my fbdev tree, so it should show up in -next as of
> tomorrow.
> 
> In the future, please also Cc linux-fbdev@vger.kernel.org on these
> things, as they're likely to be overlooked otherwise.

Will do so.

Thanks.

-- 
tejun

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

[Paul Mundt]

On Wed, Jun 15, 2011 at 04:57:21PM +0200, Tejun Heo wrote:
> 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@kernel.org>
> Cc: Jaya Kumar <jayalk@intworks.biz>
> ---
> 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.
> 
>  drivers/video/fb_defio.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
I've applied it to my fbdev tree, so it should show up in -next as of
tomorrow.

In the future, please also Cc linux-fbdev@vger.kernel.org on these
things, as they're likely to be overlooked otherwise.

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

[Tejun Heo]

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@kernel.org>
Cc: Jaya Kumar <jayalk@intworks.biz>
---
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.

 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) {