Skip to contentSkip to conversation

isdn/eicon: don't call flush_scheduled_work() from diva_os_remove_soft_isr()

PATCH In review Tejun Heo 2 participants 5 messages Oct 15, 2010 – Oct 17, 2010

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 isdn/eicon: don't call flush_scheduled_work() from diva_os_remove_soft_isr()

diva doesn't use workqueue and there is no reason to flush the system workqueue from diva_os_remove_soft_isr(). Remove it.

This is to prepare for the deprecation and removal of flush_scheduled_work().

---
 drivers/isdn/hardware/eicon/divasmain.c |    2 --
 1 file changed, 2 deletions(-)
drivers/isdn/hardware/eicon/divasmain.c +0 -2
Index: work/drivers/isdn/hardware/eicon/divasmain.c
===================================================================
@@ -15,7 +15,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
-#include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
@@ -546,7 +545,6 @@ void diva_os_remove_soft_isr(diva_os_sof
 		void *mem;
 
 		tasklet_kill(&pdpc->divas_task);
-		flush_scheduled_work();
 		mem = psoft_isr->object;
 		psoft_isr->object = NULL;
 		diva_os_free(0, mem);
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Tejun Heo

diva doesn't use workqueue and there is no reason to flush the system workqueue from diva_os_remove_soft_isr(). Remove it.

This is to prepare for the deprecation and removal of flush_scheduled_work().

This is a leftover. Thanks.

Quoted 26 lines

---
drivers/isdn/hardware/eicon/divasmain.c | 2 --

1 file changed, 2 deletions(-)

Index: work/drivers/isdn/hardware/eicon/divasmain.c
===================================================================

drivers/isdn/hardware/eicon/divasmain.c +0 -2
@@ -15,7 +15,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
-#include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
@@ -546,7 +545,6 @@ void diva_os_remove_soft_isr(diva_os_sof
 		void *mem;
 
 		tasklet_kill(&pdpc->divas_task);
-		flush_scheduled_work();
 		mem = psoft_isr->object;
 		psoft_isr->object = NULL;
 		diva_os_free(0, mem);
author
#2 lore raw

Hello,

Quoted 10 lines · Armin Schindler
Quoted 5 lines · Tejun Heo

diva doesn't use workqueue and there is no reason to flush the system workqueue from diva_os_remove_soft_isr(). Remove it.

This is to prepare for the deprecation and removal of flush_scheduled_work().

This is a leftover. Thanks.

Thank you. Are you gonna route this patch or shall I push it through wq tree?

Signature · 1 line
tejun
#3 lore raw
Quoted 10 lines · Tejun Heo

Hello,

Quoted 7 lines · Armin Schindler
Quoted 5 lines · Tejun Heo

diva doesn't use workqueue and there is no reason to flush the system workqueue from diva_os_remove_soft_isr(). Remove it.

This is to prepare for the deprecation and removal of flush_scheduled_work().

Quoted 6 lines
Quoted 3 lines

This is a leftover. Thanks.

Thank you. Are you gonna route this patch or shall I push it through wq tree?

It's your patch ;-)

Armin

author
#4 lore raw
Quoted 4 lines · Armin Schindler
Quoted 2 lines

Thank you. Are you gonna route this patch or shall I push it through wq tree?

It's your patch ;-)

Alright, queueing to wq#for-next w/ your acked-by. Thank you.

Signature · 1 line
tejun