- 2.5 API changes for bt878

- remove flush_workqueue(wq) from dvb_net.c -- don't we have to ensure that the handler has finished? all other drivers don't do this as well...?

2 files changed, 0 insertions, 14 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/dvb_compat.h b/linux/drivers/media/dvb/dvb-core/dvb_compat.h
index b867f09ff..ae64b6632 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_compat.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_compat.h
@@ -98,19 +98,6 @@ extern struct page * vmalloc_to_page(void *addr);
 #define work_struct tq_struct
 #define INIT_WORK(wq,routine,data) INIT_TQUEUE(wq,routine,data)
 #define schedule_work(wq) schedule_task(wq)
-static inline
-void flush_workqueue(struct tq_struct *wq)
-{
-	unsigned long flags;
-	/**
-	 *  we take the simple approach and just remove wq from the list of
-	 *  scheduled tasks -- should work for us
-	 */
-	spin_lock_irqsave(&tqueue_lock, flags);
-	if (test_bit(0, &wq->sync))
-		list_del(&wq->list);
-	spin_unlock_irqrestore(&tqueue_lock, flags);
-}
 #else
 #include <linux/workqueue.h>
 #endif
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index cc07299f8..fc919f4aa 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -494,7 +494,6 @@ int dvb_net_remove_if(struct dvb_net *dvbnet, int num)
 		return -EINVAL;
 
 	dvb_net_stop(&dvbnet->device[num]);
-	flush_workqueue(&priv->wq);
 	kfree(priv);
 	unregister_netdev(&dvbnet->device[num]);
 	dvbnet->state[num]=0;