[PATCH 3/3] staging: hv: remove unneeded osd_schedule_callback

Timo Teräs timo.teras at iki.fi
Sat Dec 11 11:00:54 UTC 2010


No one calls it anymore, so remove it.

Cc: Haiyang Zhang <haiyangz at microsoft.com>
Cc: Hank Janssen <hjanssen at microsoft.com>
Signed-off-by: Timo Teräs <timo.teras at iki.fi>
---
 drivers/staging/hv/osd.c |   34 ----------------------------------
 drivers/staging/hv/osd.h |    4 ----
 2 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 8c3eb27..f9a8656 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -43,12 +43,6 @@
 #include <linux/slab.h>
 #include "osd.h"
 
-struct osd_callback_struct {
-	struct work_struct work;
-	void (*callback)(void *);
-	void *data;
-};
-
 void *osd_VirtualAllocExec(unsigned int size)
 {
 #ifdef __x86_64__
@@ -198,31 +192,3 @@ int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs)
 	return ret;
 }
 EXPORT_SYMBOL_GPL(osd_WaitEventWaitEx);
-
-static void osd_callback_work(struct work_struct *work)
-{
-	struct osd_callback_struct *cb = container_of(work,
-						struct osd_callback_struct,
-						work);
-	(cb->callback)(cb->data);
-	kfree(cb);
-}
-
-int osd_schedule_callback(struct workqueue_struct *wq,
-			  void (*func)(void *),
-			  void *data)
-{
-	struct osd_callback_struct *cb;
-
-	cb = kmalloc(sizeof(*cb), GFP_KERNEL);
-	if (!cb) {
-		printk(KERN_ERR "unable to allocate memory in osd_schedule_callback\n");
-		return -1;
-	}
-
-	cb->callback = func;
-	cb->data = data;
-	INIT_WORK(&cb->work, osd_callback_work);
-	return queue_work(wq, &cb->work);
-}
-
diff --git a/drivers/staging/hv/osd.h b/drivers/staging/hv/osd.h
index ce064e8..3bd7328 100644
--- a/drivers/staging/hv/osd.h
+++ b/drivers/staging/hv/osd.h
@@ -63,8 +63,4 @@ extern int osd_WaitEventWait(struct osd_waitevent *waitEvent);
 extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent,
 			       u32 TimeoutInMs);
 
-int osd_schedule_callback(struct workqueue_struct *wq,
-			  void (*func)(void *),
-			  void *data);
-
 #endif /* _OSD_H_ */
-- 
1.7.1




More information about the devel mailing list